file cleanup, handlebars template updates