CFY-993 refactorings