cleanup with handlebars template