modify comments and typo