CFY-1304 refactorings