Rework

Reworking the class and the variables