[class] clean up and better variable names