John Calvin on John 14:3

3. And if I go away. The conditional term, if, ought to be interpreted as an adverb of time; as if it had been said, “After that I have gone away, I will return to you again.” This return must not be understood as referring to the Holy Spirit, as if Christ had manifested to the disciples some new presence of himself by the Spirit. It is unquestionably true, that Christ dwells with us and in us by his Spirit; but here he speaks of the last day of judgment, when he will, at length, come to assemble his followers. And, indeed, if we consider the whole body of the Church, he every day prepares a place for us; whence it follows, that the proper time for our entrance into heaven is not yet come.