Address flake8 complaints