Rename variable name
Rename variable name, add some comments