Pep8 and pyflakes related cleanups