CFY-1071 resolved flake8 issues.