Minor code cleanup
Add support for handlebars-like helpers
- the API is not final yet