Incorporating changes from code review