Some pep8 and pyflakes cleanup