Completed code review feedback.