code review and comments