phase 1-5: code review notes