refactor request/response correlator