changes per code review