Refactor property to variable