Some Jinja clean up