pep8 cleanups and changes