pep8 code cleanup
more pep8 cleanup