Cleanup pep8