CFY-279 flake8 fixes