Simplify client configuration code