Move client init down close to use