Pep8 cleanups