Fix comments from Github