pep8 based style cleanups