Some final clean-up

Since this is mostly a learning sample, it's okay to have the JSON pretty (and a bit bigger).