CFY-1124 flake8 fixes