Refactor client request.