Doc fix-ups
Refactor JSON formatting