Some minor changes

Modify some comments, remove some redundant code