Cleaned up handlebars helpers