Pyflakes/pep8 cleanup