Pep8 fixes

Just a bunch of pep8 fixes to the code. No content.