pep 8 cleanup
more pep8