CFY-642 flake8 fixes