CFY-505 flake8 fixes