Neater structure

Make the rendering of the values more disconnected from the storage of
them.

Const strings where they need to be connoted.