ECL-316 moved all variables, from instance variables -> local var