Refactor response calls to remove duplicated logic