Code changes requested in the review.