Flake8 fixes