Some pep8 cleanups