Tidy up, add Handlebars global