diff --git a/build.json b/build.json
index d957ebb..db860d2 100644
--- a/build.json
+++ b/build.json
@@ -1,5 +1,5 @@
 [
-  "src/Parser.js",
   "src/HTMLImports.js",
+  "src/Parser.js",
   "src/boot.js"
 ]
diff --git a/html-imports.js b/html-imports.js
index 74037ad..565672b 100644
--- a/html-imports.js
+++ b/html-imports.js
@@ -9,9 +9,9 @@
 var thisFile = 'html-imports.js';
 var scopeName = 'HTMLImports';
 var modules = [
-    'src/Parser.js',
-    'src/HTMLImports.js',
-    'src/boot.js'
+  'src/HTMLImports.js',
+  'src/Parser.js',
+  'src/boot.js'
 ];
 
 // export 
@@ -30,7 +30,7 @@ var basePath = src.slice(0, src.indexOf(thisFile));
 if (!window.Loader) {
   var path = basePath + 'tools/loader/loader.js';
   document.write('<script src="' + path + '"></script>');
-} 
+}
 document.write('<script>Loader.load("' + scopeName + '")</script>');
-  
+
 })();
diff --git a/src/HTMLImports.js b/src/HTMLImports.js
index db0239d..a77e716 100644
--- a/src/HTMLImports.js
+++ b/src/HTMLImports.js
@@ -36,6 +36,8 @@ var STYLE_LINK_TYPE = 'stylesheet';
 // linked style sheets in an <element> are loaded, and the content gets path fixups
 // inline style sheets get path fixups when their containing import modifies paths
 
+var loader;
+
 var importer = {
   documents: {},
   cache: {},
@@ -169,8 +171,6 @@ function makeDocument(resource, url) {
   return doc;
 }
 
-var loader;
-
 var Loader = function(inOnLoad, inOnComplete) {
   this.onload = inOnLoad;
   this.oncomplete = inOnComplete;
diff --git a/tools b/tools
index 2a2bcbb..d4194fe 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 2a2bcbbb093200b0118b440f88172986846ca659
+Subproject commit d4194fed0aa30e89fd3ba405f64ade3e45bd6d47