Add code review remarks and changes.