PEP8 and Pyflakes fixes