refactor remove instance variables use let in context