PEP8/Pyflakes corrections.