pep8 and cleanup