CFY-1187 refactor