Addressed code review feedback.