Clean up format / structure

[jandrieu]

@iherman suggested in #49 (review)

Wouldn't it be cleaner if all current entries in §3 followed exactly the same structure (in terms of subtitles) as the entries listed in §2.2? This is mostly done, but the name, id, and version, are never made explicit in §3 (I realize those items are all trivially there, but it would probably be better to make it 100% explicit).

Agreed. We'll revisit this as an issue to see if we can get a more consistent format.