CFY-3 small refactoring