Pep8 from flake
More PEP8
Final PEP8
Remove unused code blocks
Merged PEP8