Top level flake8 fixes