fix comments from code review