CFY-769 flake8 fixes