Big cleanup, pep8