[DF-2241] small refactoring