diff --git a/Gruntfile.js b/Gruntfile.js
index cbe211f1..cf27b91f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -15,11 +15,36 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-compass');
   grunt.loadNpmTasks('grunt-contrib-compress');
 
-  var standaloneBuilder = require("./grunt/tasks/build_standalone.js")(grunt);
-  standaloneBuilder.registerTasks();
-  
   grunt.registerTask('default', ['jshint:all']);
+
   grunt.registerTask('buildDistribution',
     'Builds and lints jasmine.js, jasmine-html.js, jasmine.css',
-    ['compass', 'jshint:beforeConcat', 'concat', 'jshint:afterConcat']);
+    [
+      'compass',
+      'jshint:beforeConcat',
+      'concat',
+      'jshint:afterConcat'
+    ]
+  );
+
+  var standaloneBuilder = require('./grunt/tasks/build_standalone.js');
+
+  grunt.registerTask("build:compileSpecRunner",
+    "Processes the spec runner template and writes to a tmp file",
+    standaloneBuilder.compileSpecRunner
+  );
+
+  grunt.registerTask("build:cleanSpecRunner",
+    "Deletes the tmp spec runner file",
+    standaloneBuilder.cleanSpecRunner
+  );
+
+  grunt.registerTask("buildStandaloneDist",
+    "Builds a standalone distribution",
+    [
+      "build:compileSpecRunner",
+      "compress:standalone",
+      "build:cleanSpecRunner"
+    ]
+  );
 };
\ No newline at end of file
diff --git a/grunt/config/compass.js b/grunt/config/compass.js
index 4cd59fc5..0bde5e48 100644
--- a/grunt/config/compass.js
+++ b/grunt/config/compass.js
@@ -2,9 +2,9 @@ module.exports = {
   jasmine: {
     options: {
       cssDir: 'src/html',
-        sassDir: 'src/html',
-        outputStyle: 'compact',
-        lineComments: false
+      sassDir: 'src/html',
+      outputStyle: 'compact',
+      lineComments: false
     }
   }
 };
\ No newline at end of file
diff --git a/grunt/tasks/build_standalone.js b/grunt/tasks/build_standalone.js
index 252d7c68..285b57b6 100644
--- a/grunt/tasks/build_standalone.js
+++ b/grunt/tasks/build_standalone.js
@@ -1,37 +1,17 @@
+var grunt = require("grunt");
 var _ = require("underscore");
 
-module.exports = function(grunt) {
-  return {
-    registerTasks: function() {
-      grunt.registerTask("build:compileSpecRunner",
-        "Processes the spec runner template and writes to a tmp file",
-        this.compileSpecRunner
-      );
+function standaloneTmpDir(path) {  return "dist/tmp/" + path; }
 
-      grunt.registerTask("build:cleanSpecRunner",
-        "Deletes the tmp spec runner file",
-        this.cleanSpecRunner
-      );
+module.exports = {
+  compileSpecRunner: function() {
+    var runnerTemplate = _.template(grunt.file.read("lib/templates/SpecRunner.html.jst")),
+      runner = runnerTemplate({ jasmineVersion: global.jasmineVersion });
 
-      grunt.registerTask("buildStandaloneDist",
-        "Builds a standalone distribution",
-        ["build:compileSpecRunner", "compress:standalone", "build:cleanSpecRunner"]
-      );
-    },
+    grunt.file.write(standaloneTmpDir("SpecRunner.html"), runner);
+  },
 
-    compileSpecRunner: function() {
-      var runnerTemplate = _.template(grunt.file.read("lib/templates/SpecRunner.html.jst")),
-        runner = runnerTemplate({ jasmineVersion: global.jasmineVersion });
-
-      grunt.file.write(standaloneTmpDir("SpecRunner.html"), runner);
-    },
-
-    cleanSpecRunner: function() {
-      grunt.file.delete(standaloneTmpDir(""));
-    }
-  };
-
-  function standaloneTmpDir(path) {
-    return "dist/tmp/" + path;
+  cleanSpecRunner: function() {
+    grunt.file.delete(standaloneTmpDir(""));
   }
-};
\ No newline at end of file
+};