Changes related to Code review comments.