modify some code with code review