Cleanup, pep8