refactor using new {{#if}} {{else}} syntax