pyflakes and pep8 fixes.