Address code review feedback.