Incorporating more comments from code review