remove comment and shorten some codes and change value name.