Apply pep8 fixes and refactor some sections to be more idiomatic
(e.g. avoiding triple nested loops). Also some minor reorganisation
of the sections to give the text a better flow.