Start fixing comments
Fix comments from Github