Refactor response/request