JS cleanup - replace string concat with templates

Misc. JS cleanup thingy.