PEP8 & others fixes

Flake8Lint is our friend