Comment and variable name change