Changes per code review notes