response refactor