Reduced code complexity in Client