[DF-2425] Small refactoring