[DF-3327] small refactoring