DAR-777, small refactoring