pep8 and clean up