Remove local variable to class variable