Changes suggested in the code review.