Use Jinja templates
Clean up
Clean up
Template adjustments