Changes based on the code review.