Fixed !necessary class variables
Fixed !necessary class variables