Fix comments: these are not trailing comments