CFY-883 flake8 fixes