Refactor property references