Addressing code review.