CFY-3 flake8 fixes