diff --git a/.jshintignore b/.jshintignore
index be17cab..4a4524b 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,2 +1 @@
-grunt.js
-src\jquery.uls.data.js
+src/jquery.uls.data.js
diff --git a/.jshintrc b/.jshintrc
index 2b42909..7a42958 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,26 +1,32 @@
 {
+	// Enforcing
+	"bitwise": true,
 	"camelcase": true,
 	"curly": true,
 	"eqeqeq": true,
+	"forin": false,
 	"immed": true,
 	"latedef": true,
 	"newcap": true,
 	"noarg": true,
 	"noempty": true,
 	"nonew": true,
+	"onevar": true,
 	"quotmark": "single",
+	"regexp": false,
+	"strict": true,
 	"trailing": true,
 	"undef": true,
 	"unused": true,
-	"onevar": true,
-	"bitwise": true,
-	"forin": false,
-	"regexp": false,
-	"strict": true,
+
+	// Relax
 	"laxbreak": true,
-	"smarttabs": true,
 	"multistr": true,
+	"smarttabs": true,
+
+	// Environment
 	"browser": true,
+
 	"predef": [
 		"_",
 		"jQuery",
diff --git a/Gruntfile.js b/Gruntfile.js
index 82347c1..7ba38c8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,32 +1,22 @@
-/*!
- * Grunt file
- *
- * @package jquery.i18n
- */
-'use strict';
 /*jshint node:true */
+'use strict';
 module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-contrib-qunit' );
 
 	grunt.initConfig( {
-		pkg: grunt.file.readJSON( 'package.json' ),
 		jshint: {
-			options: JSON.parse( grunt.file.read( '.jshintrc' )
-				.replace( /\/\*(?:(?!\*\/)[\s\S])*\*\//g, '' ).replace( /\/\/[^\n\r]*/g, '' ) ),
-			all: ['src/jquery.uls.core.js',
-			'src/jquery.uls.lcd.js',
-			'src/jquery.uls.data.utils.js',
-			'src/jquery.uls.languagefilter.js',
-			'src/jquery.uls.regionfilter.js' ]
+			options: {
+				jshintrc: true
+			},
+			all: ['*.js', 'src/*.js']
 		},
 		qunit: {
-			all: ['test/index.html']
+			all: 'test/index.html'
 		}
 	} );
 
-	grunt.registerTask( 'lint', ['jshint'] );
-	grunt.registerTask( 'unit', ['qunit'] );
-	grunt.registerTask( 'test', ['lint', 'unit'] );
-	grunt.registerTask( 'default', ['test'] );
+	grunt.registerTask( 'lint', 'jshint' );
+	grunt.registerTask( 'test', ['lint', 'qunit'] );
+	grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 322310c..6c9fb7e 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,10 @@
     "Siebrand Mazeland"
   ],
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1",
-    "grunt-contrib-jshint": "~0.5.4",
-    "grunt-contrib-qunit": "~0.2.1",
-    "grunt-contrib-jasmine": "~0.4",
-    "grunt-contrib-copy": ">0.0.0"
+    "grunt": "^0.4.5",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-jshint": "^0.8.0",
+    "grunt-contrib-qunit": "^0.5.2"
   },
   "repository": {
     "type": "git",