Update comments
Modify a variable name
Format