redesign jinja_renderer according notes 1 and 2 of the PR #136