Addressing code review feedback.