pep8 cleanup
pyflakes cleanup