Change variable name and add comments