Some flake8 goodness