Some minor changes for comments