Review fixes
Flake8