Make changes from code review.