[DF-4721] small refactoring