CFY-649 small refactoring