PEP8 and pyflakes cleanup.