Update to use ES6 template strings format