A bunch of comments adhering to pep8

- and some formatting fixes I believe
4 jobs for 43-unittests in 1 minute and 34 seconds (queued for 1 second)