Made variable names make more sense