comments and variable name change