refactor instance variables, properties