Handlebars project - refactor