Misc. pep8 fixes from a better pep8 checker