Changes for code review, and comments.