PEP 8/Pyflakes fixes