Minor comment fixing, and code improving.