Made variable names simpler