Final cleanups for HTMLBars wip