CFY-1134 flake8 fixes