JS cleanup - replace string concat with templates