Remove unneeded arrays, collapse objects

Clean up what's returned to make it more consumable.