Enhanced readability of the Client class