Pep8 and Pyflakes corrections