pep8 cleanup
more pep8 cleanup
and more pep8