flake8-driven corrections