diff --git a/bench/minification.json b/bench/minification.json
index 136be15..b17b744 100644
--- a/bench/minification.json
+++ b/bench/minification.json
@@ -1,66 +1,66 @@
 {
-  "Amazon.html": {
+  "Amazon": {
     "original": {
-      "absolute": 367015,
+      "absolute": 368816,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 351742,
-      "relative": 0.9583858970341812
+      "absolute": 353526,
+      "relative": 0.9585430133182942
     },
     "html-minifier": {
-      "absolute": 351955,
-      "relative": 0.9589662547852268
+      "absolute": 353730,
+      "relative": 0.9590961346579324
     },
     "minimize": {
-      "absolute": 358129,
-      "relative": 0.9757884555127174
+      "absolute": 359912,
+      "relative": 0.9758578803522624
     }
   },
-  "BBC.html": {
+  "BBC": {
     "original": {
-      "absolute": 245680,
+      "absolute": 246217,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 231431,
-      "relative": 0.9420017909475741
+      "absolute": 231730,
+      "relative": 0.941161658212065
     },
     "html-minifier": {
-      "absolute": 233884,
-      "relative": 0.9519863236730707
+      "absolute": 234186,
+      "relative": 0.9511365990163149
     },
     "minimize": {
-      "absolute": 238025,
-      "relative": 0.9688415825464018
+      "absolute": 238547,
+      "relative": 0.96884861727663
     }
   },
-  "Bing.html": {
+  "Bing": {
     "original": {
-      "absolute": 91242,
+      "absolute": 92029,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 89717,
-      "relative": 0.9832862059139431
+      "absolute": 90485,
+      "relative": 0.983222679807452
     },
     "html-minifier": {
-      "absolute": 89834,
-      "relative": 0.9845685101159554
+      "absolute": 90599,
+      "relative": 0.9844614197698551
     },
     "minimize": {
-      "absolute": 90222,
-      "relative": 0.9888209377260472
+      "absolute": 91020,
+      "relative": 0.98903606471873
     }
   },
-  "Bootstrap.html": {
+  "Bootstrap": {
     "original": {
       "absolute": 309742,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 271218,
-      "relative": 0.8756255205945593
+      "absolute": 271220,
+      "relative": 0.8756319775813419
     },
     "html-minifier": {
       "absolute": 270355,
@@ -71,14 +71,14 @@
       "relative": 0.900717371231541
     }
   },
-  "Coding Horror.html": {
+  "Coding Horror": {
     "original": {
       "absolute": 84628,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 79832,
-      "relative": 0.9433284492130264
+      "absolute": 79834,
+      "relative": 0.9433520820532212
     },
     "html-minifier": {
       "absolute": 79273,
@@ -89,14 +89,14 @@
       "relative": 0.9671030864489294
     }
   },
-  "ECMA-262.html": {
+  "ECMA-262": {
     "original": {
       "absolute": 6316389,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 5719864,
-      "relative": 0.9055591731288241
+      "absolute": 5744300,
+      "relative": 0.9094278392290278
     },
     "html-minifier": {
       "absolute": 5663106,
@@ -107,122 +107,122 @@
       "relative": 0.9181432619175292
     }
   },
-  "Google.html": {
+  "Google": {
     "original": {
-      "absolute": 197044,
+      "absolute": 197290,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 196337,
-      "relative": 0.9964119689003471
+      "absolute": 196589,
+      "relative": 0.9964468548836738
     },
     "html-minifier": {
-      "absolute": 196322,
-      "relative": 0.9963358437709344
+      "absolute": 196568,
+      "relative": 0.9963404125906027
     },
     "minimize": {
-      "absolute": 196530,
-      "relative": 0.9973914455654574
+      "absolute": 196776,
+      "relative": 0.997394698160069
     }
   },
-  "Hacker News.html": {
+  "Hacker News": {
     "original": {
-      "absolute": 34491,
+      "absolute": 34021,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 28661,
-      "relative": 0.8309703980748601
+      "absolute": 28189,
+      "relative": 0.8285764674759707
     },
     "html-minifier": {
-      "absolute": 28593,
-      "relative": 0.8289988692702445
+      "absolute": 28109,
+      "relative": 0.8262249786896328
     },
     "minimize": {
-      "absolute": 30782,
-      "relative": 0.8924647009364762
+      "absolute": 30318,
+      "relative": 0.8911554628023868
     }
   },
-  "NY Times.html": {
+  "NY Times": {
     "original": {
-      "absolute": 945220,
+      "absolute": 1267834,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 940973,
-      "relative": 0.9955068661264045
+      "absolute": 1263698,
+      "relative": 0.9967377432692293
     },
     "html-minifier": {
-      "absolute": 940656,
-      "relative": 0.9951714944668966
+      "absolute": 1263082,
+      "relative": 0.9962518752454974
     },
     "minimize": {
-      "absolute": 941960,
-      "relative": 0.9965510674763547
+      "absolute": 1264354,
+      "relative": 0.997255161164632
     }
   },
-  "Reddit.html": {
+  "Reddit": {
     "original": {
-      "absolute": 671886,
+      "absolute": 651577,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 668097,
-      "relative": 0.99436065046749
+      "absolute": 648036,
+      "relative": 0.9945654926432332
     },
     "html-minifier": {
-      "absolute": 667808,
-      "relative": 0.9939305179747755
+      "absolute": 647776,
+      "relative": 0.9941664607559813
     },
     "minimize": {
-      "absolute": 668652,
-      "relative": 0.995186683455229
+      "absolute": 648422,
+      "relative": 0.9951579015219997
     }
   },
-  "Stack Overflow.html": {
+  "Stack Overflow": {
     "original": {
-      "absolute": 112268,
+      "absolute": 112229,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 86801,
-      "relative": 0.7731588698471514
+      "absolute": 86770,
+      "relative": 0.7731513245239644
     },
     "html-minifier": {
-      "absolute": 86422,
-      "relative": 0.7697830192040475
+      "absolute": 86383,
+      "relative": 0.7697030179365405
     },
     "minimize": {
-      "absolute": 89721,
-      "relative": 0.7991680621370293
+      "absolute": 89682,
+      "relative": 0.7990982722825651
     }
   },
-  "Twitter.html": {
+  "Twitter": {
     "original": {
-      "absolute": 315988,
+      "absolute": 315154,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 273258,
-      "relative": 0.8647733458232592
+      "absolute": 272544,
+      "relative": 0.8647962583371939
     },
     "html-minifier": {
-      "absolute": 265976,
-      "relative": 0.8417281668924136
+      "absolute": 265242,
+      "relative": 0.841626633328468
     },
     "minimize": {
-      "absolute": 308694,
-      "relative": 0.9769168449434789
+      "absolute": 307860,
+      "relative": 0.9768557594065124
     }
   },
-  "Wikipedia.html": {
+  "Wikipedia": {
     "original": {
       "absolute": 1411155,
       "relative": 1
     },
     "hyperbuild-nodejs": {
-      "absolute": 1319364,
-      "relative": 0.9349532829490736
+      "absolute": 1319433,
+      "relative": 0.9350021790660842
     },
     "html-minifier": {
       "absolute": 1308864,
diff --git a/bench/minification.png b/bench/minification.png
index 4e93714..d598b13 100644
Binary files a/bench/minification.png and b/bench/minification.png differ
diff --git a/bench/speed.json b/bench/speed.json
index a87551d..d8e81b6 100644
--- a/bench/speed.json
+++ b/bench/speed.json
@@ -1,67 +1,67 @@
 {
-  "Amazon.html": {
-    "hyperbuild-nodejs": 453.9446367209197,
-    "html-minifier": 42.41045313663229,
-    "minimize": 114.74500577302787
+  "Amazon": {
+    "hyperbuild-nodejs": 508.6052506017873,
+    "html-minifier": 42.25586310792637,
+    "minimize": 112.84668317196737
   },
-  "BBC.html": {
-    "hyperbuild-nodejs": 471.95373182009035,
-    "html-minifier": 44.62434122645009,
-    "minimize": 143.76941073868343
+  "BBC": {
+    "hyperbuild-nodejs": 532.8102905973569,
+    "html-minifier": 54.543166381705994,
+    "minimize": 158.04711027873367
   },
-  "Bing.html": {
-    "hyperbuild-nodejs": 1983.283549298642,
-    "html-minifier": 224.4254863951391,
-    "minimize": 547.4731257876035
+  "Bing": {
+    "hyperbuild-nodejs": 2163.2302078550147,
+    "html-minifier": 226.06394079630297,
+    "minimize": 545.0653574947338
   },
-  "Bootstrap.html": {
-    "hyperbuild-nodejs": 207.1001839706425,
-    "html-minifier": 9.155727796452659,
-    "minimize": 23.405526541070603
+  "Bootstrap": {
+    "hyperbuild-nodejs": 276.9069916779089,
+    "html-minifier": 9.088104379498866,
+    "minimize": 23.551904759608103
   },
-  "Coding Horror.html": {
-    "hyperbuild-nodejs": 1009.9271101767229,
-    "html-minifier": 58.570673337738285,
-    "minimize": 192.6296247484631
+  "Coding Horror": {
+    "hyperbuild-nodejs": 1130.8127333329164,
+    "html-minifier": 57.409616058969526,
+    "minimize": 187.28893041569714
   },
-  "ECMA-262.html": {
-    "hyperbuild-nodejs": 12.651620170239344,
-    "html-minifier": 0.5175151408492638,
-    "minimize": 1.3331944009226142
+  "ECMA-262": {
+    "hyperbuild-nodejs": 16.78425400473028,
+    "html-minifier": 0.5081461293026476,
+    "minimize": 1.3377251957362182
   },
-  "Google.html": {
-    "hyperbuild-nodejs": 1755.84144550864,
-    "html-minifier": 327.57989037094177,
-    "minimize": 559.7413104037764
+  "Google": {
+    "hyperbuild-nodejs": 1856.1401576820815,
+    "html-minifier": 326.33685434942925,
+    "minimize": 555.6574376056606
   },
-  "Hacker News.html": {
-    "hyperbuild-nodejs": 1698.4814577832713,
-    "html-minifier": 86.84874410099094,
-    "minimize": 272.4655268930861
+  "Hacker News": {
+    "hyperbuild-nodejs": 2243.718482073889,
+    "html-minifier": 86.20536879655822,
+    "minimize": 272.83901988612814
   },
-  "NY Times.html": {
-    "hyperbuild-nodejs": 303.09869941070536,
-    "html-minifier": 42.081296690280986,
-    "minimize": 105.9439759928125
+  "NY Times": {
+    "hyperbuild-nodejs": 281.05098122387943,
+    "html-minifier": 35.57258739419913,
+    "minimize": 85.73538788107287
   },
-  "Reddit.html": {
-    "hyperbuild-nodejs": 347.3501992232369,
-    "html-minifier": 43.965316436512296,
-    "minimize": 119.53066163219651
+  "Reddit": {
+    "hyperbuild-nodejs": 410.12831233429847,
+    "html-minifier": 45.16614107393938,
+    "minimize": 122.77229783626386
   },
-  "Stack Overflow.html": {
-    "hyperbuild-nodejs": 699.0528884626148,
-    "html-minifier": 48.9868522505873,
-    "minimize": 158.237902766563
+  "Stack Overflow": {
+    "hyperbuild-nodejs": 844.9492250936706,
+    "html-minifier": 47.752958982642866,
+    "minimize": 157.06321076776504
   },
-  "Twitter.html": {
-    "hyperbuild-nodejs": 261.0846884406236,
-    "html-minifier": 41.807088664465276,
-    "minimize": 165.579606845361
+  "Twitter": {
+    "hyperbuild-nodejs": 279.4114354197891,
+    "html-minifier": 41.71822833204345,
+    "minimize": 164.8527211050192
   },
-  "Wikipedia.html": {
-    "hyperbuild-nodejs": 47.35485721052862,
-    "html-minifier": 3.1776064565607642,
-    "minimize": 8.735035310526898
+  "Wikipedia": {
+    "hyperbuild-nodejs": 57.721598283350104,
+    "html-minifier": 3.1325913382989596,
+    "minimize": 8.741663457588
   }
 }
\ No newline at end of file
diff --git a/bench/speed.png b/bench/speed.png
index 39d0edd..a2fc029 100644
Binary files a/bench/speed.png and b/bench/speed.png differ