CFY-54 flake8 fixes