diff --git a/ResourceLoaderULSModule.php b/ResourceLoaderULSModule.php
index 88bf2751..4bbd6ebd 100644
--- a/ResourceLoaderULSModule.php
+++ b/ResourceLoaderULSModule.php
@@ -53,6 +53,7 @@ class ResourceLoaderULSModule extends ResourceLoaderModule {
 		foreach ( $this->getData() as $key => $value ) {
 			$out .= Xml::encodeJsCall( 'mw.config.set', array( $key, $value ) );
 		}
+
 		return $out;
 	}
 
@@ -77,6 +78,7 @@ class ResourceLoaderULSModule extends ResourceLoaderModule {
 			'hash' => $hash,
 			'timestamp' => $timestamp,
 		) );
+
 		return $timestamp;
 	}
 }
diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index f776b43f..b3fa7e8b 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -33,6 +33,7 @@ class UniversalLanguageSelectorHooks {
 		if ( !$wgULSEnableAnon && $user->isAnon() ) {
 			return false;
 		}
+
 		return true;
 	}
 
@@ -141,6 +142,7 @@ class UniversalLanguageSelectorHooks {
 		foreach ( $preferred as $code => $weight ) {
 			if ( isset( $supported[$code] ) ) {
 				wfProfileOut( __METHOD__ );
+
 				return $code;
 			}
 		}
@@ -152,11 +154,13 @@ class UniversalLanguageSelectorHooks {
 			$code = $parts[0];
 			if ( isset( $supported[$code] ) ) {
 				wfProfileOut( __METHOD__ );
+
 				return $code;
 			}
 		}
 
 		wfProfileOut( __METHOD__ );
+
 		return '';
 	}
 
@@ -206,6 +210,7 @@ class UniversalLanguageSelectorHooks {
 				// Apply immediately
 				$code = $languageToSave;
 			}
+
 			// Otherwise just use what is stored in preferences
 			return true;
 		}
@@ -219,6 +224,7 @@ class UniversalLanguageSelectorHooks {
 		if ( self::isSupportedLanguage( $languageToSave ) ) {
 			$request->response()->setcookie( 'language', $languageToSave );
 			$code = $languageToSave;
+
 			return true;
 		}
 
@@ -226,6 +232,7 @@ class UniversalLanguageSelectorHooks {
 		$languageToUse = $request->getCookie( 'language' );
 		if ( self::isSupportedLanguage( $languageToUse ) ) {
 			$code = $languageToUse;
+
 			return true;
 		}
 
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index fa50ef86..12cae2b2 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -75,8 +75,8 @@ $wgULSEnableAnon = true;
 
 /**
  * Allow anonymous users to change language with cookie and setlang
- * query param.
-
+ * query parameter.
+ *
  * Do not use if you are caching anonymous page views without
  * taking cookies into account.
  *
@@ -130,7 +130,6 @@ $wgULSEventLogging = false;
  */
 $wgULSNoImeSelectors = array( '#wpCaptchaWord', '.ve-ce-documentNode' );
 
-
 /**
  * Array of jQuery selectors of elements on which webfonts must not be applied.
  * By default exclude the interwiki language links.
@@ -161,17 +160,17 @@ $wgHooks['UserGetLanguageObject'][] = 'UniversalLanguageSelectorHooks::getLangua
 $wgHooks['SkinTemplateOutputPageBeforeExec'][] =
 	'UniversalLanguageSelectorHooks::onSkinTemplateOutputPageBeforeExec';
 
-
 $wgDefaultUserOptions['uls-preferences'] = '';
 $wgHooks['GetPreferences'][] = 'UniversalLanguageSelectorHooks::onGetPreferences';
 
-$wgExtensionFunctions[] = function() {
+$wgExtensionFunctions[] = function () {
 	global $wgHooks, $wgResourceModules, $wgULSEventLogging, $wgULSGeoService;
 
 	if ( $wgULSGeoService === true ) {
-		$wgHooks['BeforePageDisplay'][] = function( &$out ) {
+		$wgHooks['BeforePageDisplay'][] = function ( &$out ) {
 			/** @var OutputPage $out */
 			$out->addScript( '<script src="//bits.wikimedia.org/geoiplookup"></script>' );
+
 			return true;
 		};
 	}
@@ -183,13 +182,13 @@ $wgExtensionFunctions[] = function() {
 		if ( class_exists( 'ResourceLoaderSchemaModule' ) ) {
 			/// @see https://meta.wikimedia.org/wiki/Schema:UniversalLanguageSelector
 			$wgResourceModules['schema.UniversalLanguageSelector'] = array(
-				'class'  => 'ResourceLoaderSchemaModule',
+				'class' => 'ResourceLoaderSchemaModule',
 				'schema' => 'UniversalLanguageSelector',
 				'revision' => 5729800,
 			);
 		} else {
 			wfWarn( 'UniversalLanguageSelector is configured to use EventLogging, but '
-					. 'the extension is is not available. Disabling wgULSEventLogging.' );
+				. 'the extension is is not available. Disabling wgULSEventLogging.' );
 			$wgULSEventLogging = false;
 		}
 	}
diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index ac3ec067..1bf1c8c3 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -29,7 +29,7 @@ class ApiULSLocalization extends ApiBase {
 
 		$params = $this->extractRequestParams();
 		$language = $params['language'];
-		if ( !Language::isValidCode( $language ) )  {
+		if ( !Language::isValidCode( $language ) ) {
 			$this->dieUsage( 'Invalid language', 'invalidlanguage' );
 		}
 
diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index 8da64e59..a3cbb2de 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -138,7 +138,6 @@ div.display-settings-block:hover .settings-text {
 	opacity: 1;
 }
 
-
 button.button {
 	display: inline-block;
 	padding: 0.4065em 1.2195em 0.4065em;
diff --git a/resources/css/ext.uls.displaysettings.css b/resources/css/ext.uls.displaysettings.css
index 52cbb95c..8ba12135 100644
--- a/resources/css/ext.uls.displaysettings.css
+++ b/resources/css/ext.uls.displaysettings.css
@@ -56,9 +56,10 @@ div.display-settings-block {
 	border-top: 1px solid #EEEEEE;
 	padding-top: 25px;
 	top: -20px;
-	position:relative;
+	position: relative;
 	min-height: 150px;
 }
+
 .uls-display-settings-font-selectors {
 	margin: 5px 0 15px 0;
 	border-top: 1px solid #EEEEEE;
diff --git a/resources/css/ext.uls.inputsettings.css b/resources/css/ext.uls.inputsettings.css
index 7471badd..12a0fa9d 100644
--- a/resources/css/ext.uls.inputsettings.css
+++ b/resources/css/ext.uls.inputsettings.css
@@ -71,7 +71,7 @@ div.input-settings-block {
 }
 
 .ext-uls-input-settings-imes-title:empty {
-	display:none;
+	display: none;
 }
 
 .uls-input-settings-disable-info,
diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index 5b282b3e..b3d45ab7 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -524,7 +524,7 @@
 				} );
 
 				displaySettings.$parent.position();
-				$tabButtons.filter( '.down' ).removeClass( 'down');
+				$tabButtons.filter( '.down' ).removeClass( 'down' );
 				$button.addClass( 'down' );
 
 			} );
diff --git a/resources/js/ext.uls.eventlogger.js b/resources/js/ext.uls.eventlogger.js
index d9ecb193..d49dca7f 100644
--- a/resources/js/ext.uls.eventlogger.js
+++ b/resources/js/ext.uls.eventlogger.js
@@ -85,7 +85,7 @@
 			mw.hook( 'mw.uls.interface.language.change' ).add( $.proxy( this.interfaceLanguageChange, this ) );
 			mw.hook( 'mw.uls.font.change' ).add( $.proxy( this.fontChange, this ) );
 			$( 'body' ).on( 'noresults.uls', '.uls-menu .languagefilter',
-				 $.proxy( this.noSearchResults, this )
+				$.proxy( this.noSearchResults, this )
 			);
 		},
 
diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index a13c7704..82b76c44 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -283,28 +283,27 @@
 		} );
 	} );
 
-	function imeNotification () {
+	function imeNotification() {
 		var notificationMsg = ( mw.config.get( 'wgULSPosition' ) === 'personal' ) ?
 				'ext-uls-input-disable-notification-info-personal' :
 				'ext-uls-input-disable-notification-info-interlanguage',
 			$notification = $( '<div>' )
-			.addClass( 'uls-ime-notification-bubble' )
-			.append(
-				$( '<div>' )
-					.attr( 'data-i18n', 'ext-uls-input-disable-notification' ),
-				$( '<div>' )
-					.addClass( 'link' )
-					.attr( 'data-i18n', 'ext-uls-input-disable-notification-undo' )
-					.on( 'click', function() {
-						$.ime.preferences.enable();
-						$.ime.preferences.save( function () {
-							mw.ime.setup();
-						} );
-					} ),
-				$( '<div>' ).attr( 'data-i18n', notificationMsg )
-			);
+				.addClass( 'uls-ime-notification-bubble' )
+				.append(
+					$( '<div>' )
+						.attr( 'data-i18n', 'ext-uls-input-disable-notification' ),
+					$( '<div>' )
+						.addClass( 'link' )
+						.attr( 'data-i18n', 'ext-uls-input-disable-notification-undo' )
+						.on( 'click', function () {
+							$.ime.preferences.enable();
+							$.ime.preferences.save( function () {
+								mw.ime.setup();
+							} );
+						} ),
+					$( '<div>' ).attr( 'data-i18n', notificationMsg )
+				);
 
 		mw.notify( $notification.i18n() );
 	}
-
 }( jQuery, mediaWiki, document ) );
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 344662a5..42b4b554 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -112,7 +112,7 @@
 		// Delay is zero if event logging is not enabled
 		window.setTimeout( function () {
 			deferred.resolve();
-		}, mw.config.get( 'wgULSEventLogging' ) * 500  );
+		}, mw.config.get( 'wgULSEventLogging' ) * 500 );
 
 	};
 
@@ -221,7 +221,9 @@
 	 */
 	function isBrowserSupported() {
 		var blacklist = {
-			'msie': [['<=', 7]]
+			'msie': [
+				['<=', 7]
+			]
 		};
 
 		// jquery.client changed in MediaWiki 1.22.
diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js
index 994636ac..53a33ff9 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -184,10 +184,10 @@
 		previousLang = previousLanguages.slice( -1 )[0];
 
 		$ulsTrigger = ( ulsPosition === 'interlanguage' ) ?
-					$( '.uls-settings-trigger' ) :
-					$( '.uls-trigger' );
+			$( '.uls-settings-trigger' ) :
+			$( '.uls-trigger' );
 
-		if ( previousLang === currentLang  ) {
+		if ( previousLang === currentLang ) {
 			$ulsTrigger.tipsy( { gravity: rtlPage ? 'e' : 'w' } );
 
 			return;
@@ -196,8 +196,7 @@
 		previousLanguages.push( currentLang );
 		mw.uls.setPreviousLanguages( previousLanguages );
 
-		anonMode = ( mw.user.isAnon() &&
-				!mw.config.get( 'wgULSAnonCanChangeLanguage' ) );
+		anonMode = ( mw.user.isAnon() && !mw.config.get( 'wgULSAnonCanChangeLanguage' ) );
 
 		if ( anonMode || !previousLang || !$.uls.data.languages[previousLang] ) {
 			// Do not show tooltip
@@ -271,7 +270,7 @@
 		}
 
 		// The interlanguage position needs some time to settle down
-		window.setTimeout( function() {
+		window.setTimeout( function () {
 			// Show the tipsy tooltip on page load.
 			showTipsy( 6000 );
 		}, 500 );
diff --git a/resources/js/ext.uls.languagesettings.js b/resources/js/ext.uls.languagesettings.js
index 6e408154..38f1ad38 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -97,10 +97,10 @@
 
 			// Get the name of all registered modules and list them in left side menu.
 			// Sort the modules based on id
-			modules = $.map( $.fn.languagesettings.modules, function( element, index ) {
+			modules = $.map( $.fn.languagesettings.modules, function ( element, index ) {
 				return index;
 			} ).sort();
-			$.each( modules, function( index, moduleName ) {
+			$.each( modules, function ( index, moduleName ) {
 				if ( $.fn.languagesettings.modules.hasOwnProperty( moduleName ) ) {
 					if ( !defaultModule ) {
 						defaultModule = moduleName;
@@ -166,8 +166,8 @@
 			var top, pos, left;
 
 			pos = $.extend( {}, this.$element.offset(), {
-					height: this.$element[0].offsetHeight
-				} );
+				height: this.$element[0].offsetHeight
+			} );
 			top = this.top || pos.top + pos.height;
 			left = this.left || '25%';
 			this.$window.css( {