[DF-4218] Minor refactoring