[DF-2946] small refactoring