diff --git a/index.js b/index.js
index db90d4f..9759a98 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
 
-
+"use strict";
 
 /**
  * @version    20.5.0
@@ -7,133 +7,129 @@
  * @license    MIT License
  */
 
+const URI = {};
 
+/**
+ * URI Template
+ * @see http://tools.ietf.org/html/rfc6570
+ */
 
-!function(URI) {
-	"use strict";
-
-	/**
-	 * URI Template
-	 * @see http://tools.ietf.org/html/rfc6570
-	 */
-
-	var RESERVED = /[!'()]/g
-	// /[[\]:\/!#$&()*+,;='?@]/g
-	, SEPARATORS = {"": ",", "+": ",", "#": ",", "?": "&"}
-	, escapeRe = /[$-/?[-^{|}]/g
-	, expandRe = /\{([#&+./;?]?)((?:[-\w%.]+(\*|:\d+)?(?:,|(?=})))+)\}/g
-	, parseRe  = RegExp(expandRe.source + "|.[^{]*?", "g")
-
-	URI.encoder = encodeURIComponent
-	URI.decoder = decodeURIComponent
-
-	/*** EXPAND ***/
-	function encodeNormal(val) {
-		return URI.encoder(val).replace(RESERVED, escape)
+var RESERVED = /[!'()]/g
+// /[[\]:\/!#$&()*+,;='?@]/g
+, SEPARATORS = {"": ",", "+": ",", "#": ",", "?": "&"}
+, escapeRe = /[$-/?[-^{|}]/g
+, expandRe = /\{([#&+./;?]?)((?:[-\w%.]+(\*|:\d+)?(?:,|(?=})))+)\}/g
+, parseRe  = RegExp(expandRe.source + "|.[^{]*?", "g")
+
+URI.encoder = encodeURIComponent
+URI.decoder = decodeURIComponent
+
+/*** EXPAND ***/
+function encodeNormal(val) {
+	return URI.encoder(val).replace(RESERVED, escape)
+}
+
+function notNull(s) {
+	return s != null
+}
+
+function mapCleanJoin(arr, mapFn, joinStr) {
+	arr = arr.map(mapFn).filter(notNull)
+	return arr.length && arr.join(joinStr)
+}
+
+function expand(template, data) {
+	return template.replace(expandRe, function(_, op, vals) {
+		var sep = SEPARATORS[op] || op
+		, named = sep == ";" || sep == "&"
+		, enc = op && sep == "," ? encodeURI : encodeNormal
+		, out = mapCleanJoin(vals.split(","), function(_name) {
+			var mod = _name.split(/[*:]/)
+			, name = mod[0]
+			, val = data[name]
+
+			if (val == null) return
+
+			if (typeof val == "object") {
+				mod = name != _name
+				if (Array.isArray(val)) {
+					val = mapCleanJoin(val, enc, mod ? named ? sep + name + "=" : sep : "," )
+				} else {
+					val = mapCleanJoin(Object.keys(val), function(key) {
+						return enc(key) + (mod ? "=" : ",") + enc(val[key])
+					}, mod && (named || sep == "/") ? sep : ",")
+					if (mod) named = 0
+				}
+				if (!val) return
+			} else {
+				val = enc(mod[1] ? val.slice(0, mod[1]) : val)
+			}
+
+			return (
+				named ?
+				name + (val || sep == "&" ? "=" + val : val) :
+				val
+			)
+		}, sep)
+
+		return out || out === "" ? (op != "+" ? op + out : out) : ""
 	}
-
-	function notNull(s) {
-		return s != null
+)}
+
+URI.expand = expand
+/**/
+
+URI.Template = function Template(template) {
+	var self = this
+	//if (!(self instanceof Template)) return new Template(template)
+	/*** PARSE ***/
+	, pos = 0
+	, lengths = {}
+	, fnStr = ""
+	, reStr = "^" + template.replace(parseRe, function(_, op, vals) {
+		if (!vals) return escapeRegExp(_)
+
+		var sep = SEPARATORS[op] || op
+		, named = sep == ";" || sep == "&"
+		return vals.split(",").map(function(_name, i) {
+			var mod = _name.split(/[*:]/)
+			, name = mod[0]
+			, re = (lengths[name] || "(") + ".*?)"
+
+			pos++
+			if (mod[1]) {
+				re = "((?:%..|.){1," + mod[1] + "})"
+				lengths[name] = "(\\" + pos
+			}
+			fnStr += "t=($[" + pos + "]||'').split('" + (mod ? named ? sep + name + "=" : sep : ",") + "').map(d);"
+			fnStr += "o[\"" + name + "\"]=" + (mod[1] === "" ? "t;" : "t.length>1?t:t[0];")
+			re = escapeRegExp(i === 0 ? op === "+" ? "" : op : sep) + (
+				named ?
+				escapeRegExp(name) + "(?:=" + re + ")?" :
+				sep == "&" ?
+				escapeRegExp(name + "=") + re :
+				re
+			)
+			return mod[1] === "" ? "(?:" + re + ")?" : re
+		}).join("")
+	}) + "$"
+	, re = RegExp(reStr)
+	, fn = Function("$,d", "var t,o={};" + fnStr + "return o")
+
+	self.template = template
+	self.match = function(uri) {
+		var match = re.exec(uri)
+		return match && fn(match, URI.decoder)
 	}
 
-	function mapCleanJoin(arr, mapFn, joinStr) {
-		arr = arr.map(mapFn).filter(notNull)
-		return arr.length && arr.join(joinStr)
+	function escapeRegExp(string) {
+		return string.replace(escapeRe, "\\$&")
 	}
-
-	function expand(template, data) {
-		return template.replace(expandRe, function(_, op, vals) {
-			var sep = SEPARATORS[op] || op
-			, named = sep == ";" || sep == "&"
-			, enc = op && sep == "," ? encodeURI : encodeNormal
-			, out = mapCleanJoin(vals.split(","), function(_name) {
-				var mod = _name.split(/[*:]/)
-				, name = mod[0]
-				, val = data[name]
-
-				if (val == null) return
-
-				if (typeof val == "object") {
-					mod = name != _name
-					if (Array.isArray(val)) {
-						val = mapCleanJoin(val, enc, mod ? named ? sep + name + "=" : sep : "," )
-					} else {
-						val = mapCleanJoin(Object.keys(val), function(key) {
-							return enc(key) + (mod ? "=" : ",") + enc(val[key])
-						}, mod && (named || sep == "/") ? sep : ",")
-						if (mod) named = 0
-					}
-					if (!val) return
-				} else {
-					val = enc(mod[1] ? val.slice(0, mod[1]) : val)
-				}
-
-				return (
-					named ?
-					name + (val || sep == "&" ? "=" + val : val) :
-					val
-				)
-			}, sep)
-
-			return out || out === "" ? (op != "+" ? op + out : out) : ""
-		}
-	)}
-
-	URI.expand = expand
 	/**/
+	/*** EXPAND ***/
+	self.expand = expand.bind(self, template)
+	/**/
+}
 
-	URI.Template = function Template(template) {
-		var self = this
-		//if (!(self instanceof Template)) return new Template(template)
-		/*** PARSE ***/
-		, pos = 0
-		, lengths = {}
-		, fnStr = ""
-		, reStr = "^" + template.replace(parseRe, function(_, op, vals) {
-			if (!vals) return escapeRegExp(_)
-
-			var sep = SEPARATORS[op] || op
-			, named = sep == ";" || sep == "&"
-			return vals.split(",").map(function(_name, i) {
-				var mod = _name.split(/[*:]/)
-				, name = mod[0]
-				, re = (lengths[name] || "(") + ".*?)"
-
-				pos++
-				if (mod[1]) {
-					re = "((?:%..|.){1," + mod[1] + "})"
-					lengths[name] = "(\\" + pos
-				}
-				fnStr += "t=($[" + pos + "]||'').split('" + (mod ? named ? sep + name + "=" : sep : ",") + "').map(d);"
-				fnStr += "o[\"" + name + "\"]=" + (mod[1] === "" ? "t;" : "t.length>1?t:t[0];")
-				re = escapeRegExp(i === 0 ? op === "+" ? "" : op : sep) + (
-					named ?
-					escapeRegExp(name) + "(?:=" + re + ")?" :
-					sep == "&" ?
-					escapeRegExp(name + "=") + re :
-					re
-				)
-				return mod[1] === "" ? "(?:" + re + ")?" : re
-			}).join("")
-		}) + "$"
-		, re = RegExp(reStr)
-		, fn = Function("$,d", "var t,o={};" + fnStr + "return o")
-
-		self.template = template
-		self.match = function(uri) {
-			var match = re.exec(uri)
-			return match && fn(match, URI.decoder)
-		}
-
-		function escapeRegExp(string) {
-			return string.replace(escapeRe, "\\$&")
-		}
-		/**/
-		/*** EXPAND ***/
-		self.expand = expand.bind(self, template)
-		/**/
-	}
-
-// `this` is `exports` in NodeJS and `window` in browser.
-}(this.URI || (this.URI = {})); // jshint ignore:line
+exports.URI = URI;
 
diff --git a/package.json b/package.json
index 30dd9b8..79a6a6e 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "litejs"
   ],
   "main": "index.js",
+  "type": "commonjs",
   "files": [],
   "bugs": "https://github.com/litejs/uri-template-lite/issues",
   "repository": "git://github.com/litejs/uri-template-lite.git",