more flake8 fixes