Changes based upon on code review.