More changes based upon code review.