CFY-400 Final flake8 fixes