pep8 fixes

Another set of pep8 fixes
I sort of wonder if the original was more readable (as horrible as the original was)