Refactor soap client init