Update things based upon code review.