change class variables to instance variables on Enum