PEP8 and pyflakes changes