Removed sourcemaps because of random error about TemplateParser.  Also made use of ES6 template literals