[DF-2822] small refactoring