[DF-2880] - Code Review, part 1.