Fix comments from code review