PEP8 fixes
More agressive PEP8 fixes
Flake8 fixes