pep8 fixes

Miscellaneous pep8 fixes.