Changed static variables into class members