switch to handlebars templates
tidy up with helpers