big cleanup and pep8