Address code review.