Add flake8 fixes to ^