Refractored to handlebar-helpers