diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index 7cf642aa..94ff710e 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -130,62 +130,49 @@ button.button.green {
 	background-image: -ms-linear-gradient(top, #00974b, #008740);
 	background-image: -moz-linear-gradient(top, #00974b, #008740);
 	background-image: linear-gradient(#00974b, #008740);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #00974b),
-		color-stop(100%, #008740) );
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #00974b), color-stop(100%, #008740));
 	background-image: -webkit-linear-gradient(top, #00974b, #008740);
 	border: 1px #0f9b3b solid;
-	-ms-filter:
-		"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00974b', endColorstr='#008740', GradientType=0)";
-	filter: progid:dximagetransform.microsoft.gradient(startColorstr='#00974b',
-		endColorstr='#008740', GradientType=0 );
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00974b', endColorstr='#008740', GradientType=0)";
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr = '#00974b', endColorstr = '#008740', GradientType = 0);
 }
 
 button.button.green:hover {
 	background-color: #119750;
 	background-image: -moz-linear-gradient(top, #10a65b, #119750);
 	background-image: -ms-linear-gradient(top, #10a65b, #119750);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #10a65b),
-		color-stop(100%, #119750) );
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #10a65b), color-stop(100%, #119750));
 	background-image: -webkit-linear-gradient(top, #10a65b, #119750);
 	background-image: linear-gradient(#10a65b, #119750);
-	-ms-filter:
-		"progid:DXImageTransform.Microsoft.gradient(startColorstr='#10a65b', endColorstr='#119750', GradientType=0)";
-	filter: progid:dximagetransform.microsoft.gradient(startColorstr='#10a65b',
-		endColorstr='#119750', GradientType=0 );
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#10a65b', endColorstr='#119750', GradientType=0)";
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr = '#10a65b', endColorstr = '#119750', GradientType = 0);
 }
 
 button.button.green:active {
 	background-color: #007236;
 	background-image: -moz-linear-gradient(top, #007236, #007236);
 	background-image: -ms-linear-gradient(top, #007236, #007236);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #007236),
-		color-stop(100%, #007236) );
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #007236), color-stop(100%, #007236));
 	background-image: -webkit-linear-gradient(top, #007236, #007236);
 	background-image: linear-gradient(#007236, #007236);
-	-ms-filter:
-		"progid:DXImageTransform.Microsoft.gradient(startColorstr='#007236', endColorstr='#007236', GradientType=0)";
-	filter: progid:dximagetransform.microsoft.gradient(startColorstr='#007236',
-		endColorstr='#007236', GradientType=0 );
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#007236', endColorstr='#007236', GradientType=0)";
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr = '#007236', endColorstr = '#007236', GradientType = 0);
 }
 
 button.button.green:disabled,
 button.button.green:disabled.hover,
 button.button.green.disabled,
-button.button.green.disabled:hover
-	{
+button.button.green.disabled:hover {
 	color: white;
 	text-shadow: none;
 	cursor: default;
 	background-color: #2ca368;
 	background-image: -moz-linear-gradient(top, #2ca368, #2ca368);
 	background-image: -ms-linear-gradient(top, #2ca368, #2ca368);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2ca368),
-		color-stop(100%, #2ca368) );
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2ca368), color-stop(100%, #2ca368));
 	background-image: -webkit-linear-gradient(top, #2ca368, #2ca368);
 	background-image: linear-gradient(#2ca368, #2ca368);
 	border-color: #278f5b;
-	-ms-filter:
-		"progid:DXImageTransform.Microsoft.gradient(startColorstr='#2ca368', endColorstr='#2ca368', GradientType=0)";
-	filter: progid:dximagetransform.microsoft.gradient(startColorstr='#2ca368',
-		endColorstr='#2ca368', GradientType=0 );
-}
\ No newline at end of file
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#2ca368', endColorstr='#2ca368', GradientType=0)";
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr = '#2ca368', endColorstr = '#2ca368', GradientType = 0);
+}
diff --git a/resources/css/ext.uls.displaysettings.css b/resources/css/ext.uls.displaysettings.css
index 59843d63..930f7d6e 100644
--- a/resources/css/ext.uls.displaysettings.css
+++ b/resources/css/ext.uls.displaysettings.css
@@ -1,4 +1,3 @@
-
 div.display-settings-block {
 	/* @embed */
 	background: transparent url('../images/display.png') no-repeat;
@@ -48,4 +47,4 @@ div.display-settings-block {
 .uls-font-label {
 	color: #555555;
 	font-size: 10pt;
-}
\ No newline at end of file
+}
diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index b3329994..a104731f 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -186,10 +186,10 @@
 				$button = $( '<button>' )
 					.addClass( 'button uls-language-button' )
 					.text( $.uls.data.getAutonym( language ) )
-					.prop({
+					.prop( {
 						lang: language,
 						dir: $.uls.data.getDir( language )
-					});
+					} );
 
 				if ( language === this.uiLanguage ) {
 					$button.addClass( 'down' );
@@ -220,11 +220,11 @@
 			$moreLanguagesButton.uls( {
 				left: that.$parent.left,
 				top: that.$parent.top,
-				onReady: function ( ) {
+				onReady: function () {
 					var uls = this,
 						$back = $( '<a>' ).prop( 'href', '#' )
-						.data( 'i18n','ext-uls-back-to-display-settings' )
-						.i18n();
+							.data( 'i18n', 'ext-uls-back-to-display-settings' )
+							.i18n();
 
 					$back.click( function () {
 						uls.hide();
@@ -233,7 +233,7 @@
 
 					uls.$menu.find( 'div.uls-title' ).append( $back );
 					uls.$menu.find( 'div.uls-title h1' )
-						.data( 'i18n','ext-uls-display-settings-ui-language' )
+						.data( 'i18n', 'ext-uls-display-settings-ui-language' )
 						.i18n();
 				},
 				onSelect: function ( langCode ) {
@@ -362,7 +362,6 @@
 		 */
 		listen: function () {
 			var that = this, $contentFontSelector, $uiFontSelector, oldFont;
-			
 
 			$contentFontSelector = this.$template
 				.find( '#content-font-selector' );
@@ -370,7 +369,7 @@
 				.find( 'select#ui-font-selector' );
 
 			oldFont = $uiFontSelector.find( 'option:selected' ).val();
-			
+
 			// TODO all these repeated selectors can be placed in object constructor.
 
 			this.$template.find( '#uls-displaysettings-apply' ).on( 'click', function () {
@@ -462,5 +461,5 @@
 	$.fn.languagesettings.modules = $.extend( $.fn.languagesettings.modules, {
 		display: DisplaySettings
 	} );
-} ) ( jQuery, mediaWiki );
+})( jQuery, mediaWiki );
 
diff --git a/resources/js/ext.uls.geoclient.js b/resources/js/ext.uls.geoclient.js
index f49c4450..c5a93691 100644
--- a/resources/js/ext.uls.geoclient.js
+++ b/resources/js/ext.uls.geoclient.js
@@ -36,9 +36,9 @@
 	// protocol is https, only if the service is not configured
 	// with http:// as the protocol
 	if ( service ) {
-		httpOnly = service.substring(0, 7) === 'http://';
+		httpOnly = service.substring( 0, 7 ) === 'http://';
 		currentProto = document.location.protocol;
-		if ( !httpOnly || currentProto  === 'http:' ) {
+		if ( !httpOnly || currentProto === 'http:' ) {
 			var settings = {
 				cache: true,
 				dataType: 'jsonp',
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index a2525371..062e61a5 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -99,7 +99,7 @@
 		var extensionPath, locales, i18n;
 
 		extensionPath = mw.config.get( 'wgExtensionAssetsPath' )
-		+ '/UniversalLanguageSelector/';
+			+ '/UniversalLanguageSelector/';
 
 		locales = mw.config.get( 'wgULSi18nLocales' );
 		i18n = $.i18n( {
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index b604619d..7b6acf5b 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -121,8 +121,8 @@
 				imeId = imes.inputmethods[index];
 				selected = defaultInputmethod === imeId;
 				//$.ime.load( imeId, function () {
-					$imeListContainer.append( inputsettings.renderInputmethodOption( imeId,
-						selected ) );
+				$imeListContainer.append( inputsettings.renderInputmethodOption( imeId,
+					selected ) );
 				//} );
 			}
 
@@ -226,10 +226,10 @@
 				$button = $( '<button>' )
 					.addClass( 'button uls-language-button' )
 					.text( $.uls.data.getAutonym( language ) )
-					.prop({
+					.prop( {
 						lang: language,
 						dir: $.uls.data.getDir( language )
-					});
+					} );
 
 				if ( language === this.imeLanguage ) {
 					$button.addClass( 'down' );
@@ -263,7 +263,7 @@
 				onReady: function () {
 					var uls = this,
 						$back = $( '<a>' ).prop( 'href', '#' )
-						.text( $.i18n( 'ext-uls-back-to-input-settings' ) );
+							.text( $.i18n( 'ext-uls-back-to-input-settings' ) );
 
 					$back.click( function () {
 						uls.hide();
@@ -288,7 +288,7 @@
 		},
 
 		prepareToggleButton: function () {
-			var inputsettings, $toggleButton, $toggleButtonDesc ;
+			var inputsettings, $toggleButton, $toggleButtonDesc;
 
 			inputsettings = this;
 
@@ -376,7 +376,7 @@
 			var inputSettings = this;
 
 			$.ime.preferences.disable();
-			$.ime.preferences.save( function() {
+			$.ime.preferences.save( function () {
 				// Update the toggle button
 				inputSettings.prepareToggleButton();
 				mw.ime.disable();
@@ -390,7 +390,7 @@
 			var inputSettings = this;
 
 			$.ime.preferences.enable();
-			$.ime.preferences.save( function() {
+			$.ime.preferences.save( function () {
 				// Update the toggle button
 				inputSettings.prepareToggleButton();
 				mw.ime.setup();
diff --git a/tests/phpunit/LanguageSearchTest.php b/tests/phpunit/LanguageSearchTest.php
index 500ab65e..f0c3a812 100644
--- a/tests/phpunit/LanguageSearchTest.php
+++ b/tests/phpunit/LanguageSearchTest.php
@@ -30,21 +30,20 @@ class LanguageSearchTest extends PHPUnit_Framework_TestCase {
 	public function searchDataProvider() {
 		return array(
 			array( "ഹിന്ദി", array(
-				 'hi' => 'ഹിന്ദി'
-				)
+				'hi' => 'ഹിന്ദി'
+			)
 			),
 			array( "മല", array(
 				'ml' => "മലയാളം",
 				'mg' => 'മലഗാസി',
 				'ms' => 'മലയ',
-				)
+			)
 			),
 			array( "Φινλαν", array(
 				'fi' => 'Φινλανδικά',
-				)
+			)
 			),
-			array( "blah", array(
-				)
+			array( 'blah', array()
 			),
 			array( "الفرنسية", array(
 				'fr' => 'الفرنسية',
@@ -52,15 +51,15 @@ class LanguageSearchTest extends PHPUnit_Framework_TestCase {
 				'fr-ch' => 'الفرنسية السويسرية',
 				'frm' => 'الفرنسية الوسطى',
 				'fro' => 'الفرنسية القديمة',
-				)
+			)
 			),
 			array( "മലയളം", array(
 				'ml' => "മലയാളം",
-				)
+			)
 			),
 			array( "finish", array(
 				'fi' => 'finnish'
-				)
+			)
 			),
 		);
 	}