diff --git a/js/battle.js b/js/battle.js
index 439beb122..903dcd586 100755
--- a/js/battle.js
+++ b/js/battle.js
@@ -194,7 +194,7 @@ var Pokemon = (function () {
 		this.name = '';
 		this.species = '';
 		this.id = '';
-		this.statbarElem = null;	
+		this.statbarElem = null;
 	}
 
 	Pokemon.prototype.getHPColor = function () {
@@ -371,7 +371,7 @@ var Pokemon = (function () {
 	};
 	Pokemon.prototype.getIdent = function () {
 		var slots = ['a','b','c','d','e','f'];
-		return this.ident.substr(0,2) + slots[this.slot] + this.ident.substr(2);	
+		return this.ident.substr(0,2) + slots[this.slot] + this.ident.substr(2);
 	};
 	Pokemon.prototype.removeVolatile = function (volatile) {
 		if (!this.hasVolatile(volatile)) return;
@@ -1771,7 +1771,7 @@ var Side = (function () {
 		if (!kwargs.silent) {
 			var fromeffect = Tools.getEffect(kwargs.from);
 			switch (fromeffect.id) {
-				case 'allyswitch':		
+				case 'allyswitch':
 					this.battle.message('<small>' + pokemon.getName() + ' and ' + target.getLowerName() + ' switched places.</small>');
 					break;
 				default:
diff --git a/js/client-battle.js b/js/client-battle.js
index a18bc4b1f..a4a69d17d 100755
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -464,7 +464,7 @@
 				}
 				if (this.request.forceSwitch !== true) {
 					var faintedLength = this.request.forceSwitch.filter(function (fainted) {return fainted;}).length;
-					this.choice.freedomDegrees = faintedLength - this.battle.mySide.pokemon.slice(this.battle.mySide.active.length).filter(function (mon) {return !mon.zerohp;}).length; 
+					this.choice.freedomDegrees = faintedLength - this.battle.mySide.pokemon.slice(this.battle.mySide.active.length).filter(function (mon) {return !mon.zerohp;}).length;
 					if (this.choice.freedomDegrees < 0) this.choice.freedomDegrees = 0;
 					this.choice.canSwitch = faintedLength - this.choice.freedomDegrees;
 
diff --git a/js/client-chat-tournament.js b/js/client-chat-tournament.js
index d00f76773..34e42d71d 100644
--- a/js/client-chat-tournament.js
+++ b/js/client-chat-tournament.js
@@ -303,7 +303,7 @@
 							this.room.notifyOnce("Tournament Automatic Disqualification Warning", "Room: " + this.room.title + "\nSeconds: " + seconds, 'tournament-autodq-warning');
 						}
 						break;
-						
+
 					case 'autostart':
 						if (data[0] === 'off') {
 							this.room.$chat.append("<div class=\"notice tournament-message-autostart\">The tournament's automatic start timeout has been turned off.</div>");
diff --git a/js/client-chat.js b/js/client-chat.js
index d012fae34..4131d8f94 100755
--- a/js/client-chat.js
+++ b/js/client-chat.js
@@ -862,7 +862,7 @@
 					Tools.prefs('avatar', avatar);
 				}
 				return text; // Send the /avatar command through to the server.
-				
+
 			// documentation of client commands
 			case 'help':
 				switch (toId(target)) {
diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 7c95dd347..c439c6acb 100755
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -276,7 +276,7 @@
 		},
 
 		// drag and drop
-		
+
 		// because of a bug in Chrome and Webkit:
 		//   https://code.google.com/p/chromium/issues/detail?id=410328
 		// we can't use CSS :hover