Changes related to code review.