Very small refactor to response builder.