CFY-516 flake8 fixes