pep8 fix and cleanup