DAR-1184, small refactoring