Update based upon code review.