cleanup and handlebars