first part of code review notes addressed