Minor comment fixing, and code improving.
Minor comment fixing, and code improving.