CFY-1500 refactor