[DF-4911] - more refactoring.