update the comments and remove unnecessary checking