diff --git a/Gruntfile.js b/Gruntfile.js
index 87ef752..ce2ecaa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,71 +1,97 @@
-$traceurRuntime.ModuleStore.getAnonymousModule(function() {
-  "use strict";
-  module.exports = function(grunt) {
-    require("traceur");
-    require("time-grunt")(grunt);
-    require("load-grunt-tasks")(grunt);
-    grunt.initConfig({
-      nodeunit: {files: ["test/**/*_test.js"]},
-      eslint: {
-        lib: ["lib/**/*.js", "!lib/parser.js"],
-        test: ["test/**/*.js"]
-      },
-      mochacli: {
-        options: {
-          reporter: "spec",
-          bail: true,
-          timeout: 15000
-        },
-        all: ["test/*.js"]
-      },
-      watch: {
-        gruntfile: {
-          files: "<%= jshint.gruntfile.src %>",
-          tasks: ["jshint:gruntfile"]
-        },
-        lib: {
-          files: "<%= jshint.lib.src %>",
-          tasks: ["jshint:lib", "mochacli"]
-        },
-        test: {
-          files: "<%= jshint.test.src %>",
-          tasks: ["jshint:test", "mochacli"]
-        }
-      },
-      peg: {spider: {
-          src: "src/spider.pegjs",
-          dest: "lib/parser.js"
-        }},
-      mocha_istanbul: {coverage: {
-          src: "test",
-          options: {
-            mask: "*.js",
-            excludes: ["lib/parser.js"]
-          }
-        }},
-      clean: {build: ["lib/"]},
-      spider_script: {
-        options: {},
-        build: {files: [{
-            expand: true,
-            cwd: "src",
-            src: ["**/*.spider"],
-            dest: "lib/",
-            ext: ".js"
-          }]}
-      },
-      copy: {build: {files: [{
-            expand: true,
-            cwd: "src",
-            src: ["**/*.js"],
-            dest: "lib/"
-          }]}}
-    });
-    grunt.registerTask("default", ["build", "mochacli"]);
-    grunt.registerTask("build", ["clean:build", "peg", "spider_script:build", "copy:build"]);
-    grunt.registerTask("coverage", ["mocha_istanbul:coverage"]);
-  };
-  return {};
-});
+"use strict";
+(function () {
+    module.exports = function (grunt) {
+        require("traceur");
+        require("time-grunt")(grunt);
+        require("load-grunt-tasks")(grunt);
+        grunt.initConfig({
+            nodeunit: { files: ["test/**/*_test.js"] },
+            eslint: {
+                lib: [
+                    "lib/**/*.js",
+                    "!lib/parser.js"
+                ],
+                test: ["test/**/*.js"]
+            },
+            mochacli: {
+                options: {
+                    reporter: "spec",
+                    bail: true,
+                    timeout: 15000
+                },
+                all: ["test/*.js"]
+            },
+            watch: {
+                gruntfile: {
+                    files: "<%= jshint.gruntfile.src %>",
+                    tasks: ["jshint:gruntfile"]
+                },
+                lib: {
+                    files: "<%= jshint.lib.src %>",
+                    tasks: [
+                        "jshint:lib",
+                        "mochacli"
+                    ]
+                },
+                test: {
+                    files: "<%= jshint.test.src %>",
+                    tasks: [
+                        "jshint:test",
+                        "mochacli"
+                    ]
+                }
+            },
+            peg: {
+                spider: {
+                    src: "src/spider.pegjs",
+                    dest: "lib/parser.js"
+                }
+            },
+            mocha_istanbul: {
+                coverage: {
+                    src: "test",
+                    options: {
+                        mask: "*.js",
+                        excludes: ["lib/parser.js"]
+                    }
+                }
+            },
+            clean: { build: ["lib/"] },
+            spider_script: {
+                options: {},
+                build: {
+                    files: [{
+                            expand: true,
+                            cwd: "src",
+                            src: ["**/*.spider"],
+                            dest: "lib/",
+                            ext: ".js"
+                        }]
+                }
+            },
+            copy: {
+                build: {
+                    files: [{
+                            expand: true,
+                            cwd: "src",
+                            src: ["**/*.js"],
+                            dest: "lib/"
+                        }]
+                }
+            }
+        });
+        grunt.registerTask("default", [
+            "build",
+            "mochacli"
+        ]);
+        grunt.registerTask("build", [
+            "clean:build",
+            "peg",
+            "spider_script:build",
+            "copy:build"
+        ]);
+        grunt.registerTask("coverage", ["mocha_istanbul:coverage"]);
+    };
+}());
 
-//# sourceMappingURL=Gruntfile.map
+//# sourceMappingURL=Gruntfile.map
\ No newline at end of file
diff --git a/package.json b/package.json
index 5273ead..4cc3a02 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "grunt": "~0.4.5"
   },
   "scripts": {
-    "test": "spider -c Gruntfile.spider && grunt && rm Gruntfile.js"
+    "test": "grunt"
   },
   "bin": {
     "spider": "cli.js"