[DF-4885] Small refactoring