Cleaning the client.h code