[DF-3966] small refactoring