[DF-1537] small refactoring