cleanup, pep8