Pyflakes and PEP8 fixes.