Change class variable to instance variable