PEP8, pyflakes changes