pep8 and cleaning up