Pep8 and pyflakes cleanup