Transition to handlebars.js
Cleanup