[DF-1534] Small refactoring