pep8 cleanups