Made some minor adjustments to the ClientHandler class