Changes based upon code review.