Clean up pep8/pylint