Cleanup Client class - added comments