improve readability on the client code