a bit more flake8 bashing