Use the Jinja templating engine to remove pre-formatting values

The premise is that a template should be responsible for the formatting of the data it is passed, hence the desire to avoid pre-formatting as we did previously.