Pep8

Collection of pep8 fixes.

I can smash this into one if you want.