diff --git a/src/Data/TemplateString/TemplateString.js b/src/Data/TemplateString/TemplateString.js
index dbb28c1..384ed00 100644
--- a/src/Data/TemplateString/TemplateString.js
+++ b/src/Data/TemplateString/TemplateString.js
@@ -1,15 +1,15 @@
 
-exports._buildExclamationKeyObject = function (tuples) {
-  var valueMap = {};
+export function _buildExclamationKeyObject(tuples) {
+  const valueMap = {};
   tuples.forEach(function (tuple) {
     valueMap['!' + tuple.value0] = tuple.value1;
   });
   return valueMap;
 };
 
-var templatePattern = /\$\{([^}]+)\}/g;
+const templatePattern = /\$\{([^}]+)\}/g;
 
-exports._getTemplateVars = function (str) {
+export function _getTemplateVars(str) {
   return (str.match(templatePattern) || []).map(function (str) {
     return str.substring(2, str.length - 1);
   });
diff --git a/src/Data/TemplateString/Unsafe/TemplateString.js b/src/Data/TemplateString/Unsafe/TemplateString.js
index 5718cad..55b9f24 100644
--- a/src/Data/TemplateString/Unsafe/TemplateString.js
+++ b/src/Data/TemplateString/Unsafe/TemplateString.js
@@ -1,9 +1,9 @@
 
-var templatePattern = /\$\{([^}]+)\}/g;
+const templatePattern = /\$\{([^}]+)\}/g;
 
-exports._templateBy = function (keyFrom, str, obj) {
+export function _templateBy(keyFrom, str, obj) {
   return str.replace(templatePattern, function (match, ident) {
-     var key = keyFrom(ident);
+     const key = keyFrom(ident);
      return Object.hasOwnProperty.call(obj, key) ? obj[key] : match;
   });
 };