CFY-650 flake8 fixes