Cleanup (pep8)