Replace class variables with instance variables