Update the code for feedback of code review