whitespace pep8 cleanups
more low-risk pep8 cleanups
more complex pep8 cleanups