refactor, remove instance variables