diff --git a/config/commands.js b/config/commands.js
index c7c6ce0bbb..3bc534f392 100644
--- a/config/commands.js
+++ b/config/commands.js
@@ -331,7 +331,7 @@ var commands = exports.commands = {
 			} else if (newTargets[0].searchType === 'move') {
 				var move = Tools.getMove(newTargets[0].name);
 				details = {
-					"Priority": move.priority,
+					"Priority": move.priority
 				};
 
 				if (move.secondary || move.secondaries) details["<font color=black>&#10003; Secondary Effect</font>"] = "";
@@ -1727,6 +1727,6 @@ var commands = exports.commands = {
 		} else if (!matched) {
 			this.sendReply("Help for the command '" + target + "' was not found. Try /help for general help");
 		}
-	},
+	}
 
 };
diff --git a/gulpfile.js b/gulpfile.js
index 2fcaa7e05d..49cba20cc4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -47,8 +47,9 @@ var jsHintOptions = {
 	}
 };
 
-gulp.task('lint', function () {
-	var directories = ['./*.js', './data/*.js', './mods/*/*.js', './tournaments/*.js', './chat-plugins/*.js', './config/*.js'];
+gulp.task('data', function () {
+	var directories = ['./data/*.js', './mods/*/*.js'];
+	jsHintOptions['es3'] = true;
 
 	// Replacing `var` with `let` is sort of a hack that stops jsHint from
 	// complaining that I'm using `var` like `let` should be used, but
@@ -63,6 +64,7 @@ gulp.task('lint', function () {
 
 gulp.task('fastlint', function () {
 	var directories = ['./*.js', './tournaments/*.js', './chat-plugins/*.js', './config/*.js'];
+	delete jsHintOptions['es3'];
 
 	return gulp.src(directories)
 		.pipe(replace(/\bvar\b/g, 'let'))
@@ -71,4 +73,5 @@ gulp.task('fastlint', function () {
 		.pipe(jshint.reporter('fail'));
 });
 
-gulp.task('default', ['lint']);
+gulp.task('default', ['fastlint', 'data']);
+gulp.task('lint', ['fastlint', 'data']);
diff --git a/mods/gen1/statuses.js b/mods/gen1/statuses.js
index 91e1f41116..5d4ecc82c1 100644
--- a/mods/gen1/statuses.js
+++ b/mods/gen1/statuses.js
@@ -335,6 +335,6 @@ exports.BattleStatuses = {
 				this.effectData.counter *= 2;
 			}
 			this.effectData.duration = 2;
-		},
+		}
 	}
 };
diff --git a/mods/gen3/moves.js b/mods/gen3/moves.js
index 5c0778ffde..5c4c93664c 100644
--- a/mods/gen3/moves.js
+++ b/mods/gen3/moves.js
@@ -591,7 +591,7 @@ exports.BattleMovedex = {
 				return;
 			}
 			return false;
-		},
+		}
 	},
 	stockpile: {
 		inherit: true,
diff --git a/mods/gen4/moves.js b/mods/gen4/moves.js
index b9eae8920c..74ad066b6f 100644
--- a/mods/gen4/moves.js
+++ b/mods/gen4/moves.js
@@ -369,7 +369,7 @@ exports.BattleMovedex = {
 	},
 	explosion: {
 		inherit: true,
-		basePower: 500,
+		basePower: 500
 		//desc: ""
 	},
 	extremespeed: {
@@ -809,7 +809,7 @@ exports.BattleMovedex = {
 	},
 	selfdestruct: {
 		inherit: true,
-		basePower: 400,
+		basePower: 400
 		//desc: ""
 	},
 	sketch: {
diff --git a/mods/gen5/formats-data.js b/mods/gen5/formats-data.js
index b4b159ab56..a8395e2e3e 100644
--- a/mods/gen5/formats-data.js
+++ b/mods/gen5/formats-data.js
@@ -3258,7 +3258,7 @@ exports.BattleFormatsData = {
 	},
 	arceusunknown: {
 		eventPokemon: [
-			{"generation":4,"level":100,"moves":["judgment","roaroftime","spacialrend","shadowforce"],"pokeball":"cherishball"},
+			{"generation":4,"level":100,"moves":["judgment","roaroftime","spacialrend","shadowforce"],"pokeball":"cherishball"}
 		],
 		tier: "Uber"
 	},
diff --git a/mods/gen5/items.js b/mods/gen5/items.js
index 00295b731a..b3f410a30e 100644
--- a/mods/gen5/items.js
+++ b/mods/gen5/items.js
@@ -32,7 +32,7 @@ exports.BattleItems = {
 		naturalGift: {
 			basePower: 60,
 			type: "Ice"
-		},
+		}
 	},
 	blukberry: {
 		inherit: true,
@@ -249,7 +249,7 @@ exports.BattleItems = {
 		naturalGift: {
 			basePower: 80,
 			type: "Flying"
-		},
+		}
 	},
 	leppaberry: {
 		inherit: true,
@@ -334,7 +334,7 @@ exports.BattleItems = {
 		naturalGift: {
 			basePower: 70,
 			type: "Steel"
-		},
+		}
 	},
 	passhoberry: {
 		inherit: true,
@@ -447,7 +447,7 @@ exports.BattleItems = {
 		naturalGift: {
 			basePower: 60,
 			type: "Ground"
-		},
+		}
 	},
 	sitrusberry: {
 		inherit: true,
diff --git a/mods/gen5/moves.js b/mods/gen5/moves.js
index 76fafce8da..f29f719e7e 100644
--- a/mods/gen5/moves.js
+++ b/mods/gen5/moves.js
@@ -125,7 +125,7 @@ exports.BattleMovedex = {
 				return false;
 			}
 			this.useMove(this.lastMove, pokemon);
-		},
+		}
 	},
 	cottonspore: {
 		inherit: true,
@@ -554,7 +554,7 @@ exports.BattleMovedex = {
 		secondary: {
 			chance: 30,
 			status: 'tox'
-		},
+		}
 	},
 	poisongas: {
 		inherit: true,
@@ -608,7 +608,7 @@ exports.BattleMovedex = {
 				}
 				return null;
 			}
-		},
+		}
 	},
 	ragepowder: {
 		num: 476,
@@ -851,7 +851,7 @@ exports.BattleMovedex = {
 		},
 		onHitSide: function (side, source) {
 			source.addVolatile('stall');
-		},
+		}
 	},
 	whirlpool: {
 		inherit: true,
diff --git a/mods/gen5/pokedex.js b/mods/gen5/pokedex.js
index 0f8f96f1a6..ec665b5211 100644
--- a/mods/gen5/pokedex.js
+++ b/mods/gen5/pokedex.js
@@ -348,7 +348,7 @@ exports.BattlePokedex = {
 	},
 	krookodile: {
 		inherit: true,
-		baseStats: {hp:95,atk:117,def:70,spa:65,spd:70,spe:92},
+		baseStats: {hp:95,atk:117,def:70,spa:65,spd:70,spe:92}
 	},
 	gothita: {
 		inherit: true,
diff --git a/mods/gennext/items.js b/mods/gennext/items.js
index b2847c6767..134152b021 100644
--- a/mods/gennext/items.js
+++ b/mods/gennext/items.js
@@ -213,5 +213,5 @@ exports.BattleItems = {
 		// 	}
 		// },
 		desc: "Raises Farfetch'd's critical hit rate two stages."
-	},
+	}
 };
diff --git a/mods/gennext/moves.js b/mods/gennext/moves.js
index 36d86fc9ef..3be792e9d8 100644
--- a/mods/gennext/moves.js
+++ b/mods/gennext/moves.js
@@ -1785,7 +1785,7 @@ exports.BattleMovedex = {
 		secondary: {
 			chance: 50,
 			volatileStatus: 'confusion'
-		},
+		}
 	},
 	nightdaze: {
 		inherit: true,