PEP8 fixes, flake8++
pep8 fixes