made changes per code review