Addressed code review items