Refactor Responses controller