general pep8 cleanup for a few files

This is pep8 only, no functionality changed.