CFY-1159 Flake8 fixes