Minor refactoring to make it more DRY
Added Handlebars helpers rendering