pep8 + pyflakes cleanup