Consolidate Client Construction