address code review feedback.