solution including handlebars, clean-up