Resulting code from group code review.

Resulting code from group code review.