Doing a little cleanup of the client code