Some Pep8 cleanups