over-aggressive flake8 fixing