better Client code