Changed some part to fit the class material

Fitted every variable to that in the class material