Changes related to Code review Part 2.