Pyflakes, pep8 fixes.