Changes per code review.

Changes per code review.