Simplify the format a little

In particular, do not capitalize keys in hashes as that leads to confusion
with fact names.