renamed variables in a sensible way