flake8 pass (pep8 and pyflakes)
Test fixes after flake8 run