diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php
index 6d882ec5..3aa5e7b4 100644
--- a/data/LanguageNameSearch.php
+++ b/data/LanguageNameSearch.php
@@ -18,7 +18,7 @@
  * @licence MIT License
  */
 class LanguageNameSearch {
-	static $languagenames;
+	protected static $languagenames;
 
 	public static function init() {
 		self::$languagenames = unserialize( file_get_contents( __DIR__ . '/langnames.ser' ) );
@@ -74,11 +74,12 @@ class LanguageNameSearch {
 	static function getCodepoint( $str ) {
 		$values = array();
 		$lookingFor = 1;
-		for ( $i = 0; $i < strlen( $str ); $i++ ) {
+		$strLen = strlen( $str );
+		for ( $i = 0; $i < $strLen; $i++ ) {
 			$thisValue = ord( $str[$i] );
 			if ( $thisValue < 128 ) {
 				return $thisValue;
-			} else { // Codepoints larger than 127 are represented by multi-byte sequences,
+			} else { // Codepoints larger than 127 are represented by multi-byte sequences
 				if ( count( $values ) === 0 ) {
 					// 224 is the lowest non-overlong-encoded codepoint.
 					$lookingFor = ( $thisValue < 224 ) ? 2 : 3;
diff --git a/data/fontrepo/scripts/compile.php b/data/fontrepo/scripts/compile.php
index 6f3c19da..3472909f 100644
--- a/data/fontrepo/scripts/compile.php
+++ b/data/fontrepo/scripts/compile.php
@@ -51,7 +51,7 @@ foreach ( glob( '../fonts/*/font.ini' ) as $inifile ) {
 		$dir = dirname( $inifile );
 
 		if ( isset( $font['ttf'] ) ) {
-			$list['fonts'][$fontname]['ttf'] = basename( $dir ) . '/' . $font['ttf'] ;
+			$list['fonts'][$fontname]['ttf'] = basename( $dir ) . '/' . $font['ttf'];
 		}
 		if ( isset( $font['svg'] ) ) {
 			$list['fonts'][$fontname]['svg'] = basename( $dir ) . '/' . $font['svg'];
@@ -89,7 +89,7 @@ ksort( $list['fonts'] );
 
 $json = json_encode( $list );
 $js = <<<JAVASCRIPT
-// Please do not edit. This file is generated from data/fontrepo by data/fontrepo/scripts/compile.php
+// Do not edit! This file is generated from data/fontrepo by data/fontrepo/scripts/compile.php
 ( function ( $ ) {
 	$.webfonts = $.webfonts || {};
 	$.webfonts.repository = $json;
diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index 9d83e431..8da64e59 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -32,8 +32,8 @@
 /* RTL text direction here (bug 45142). x:-o-prefocus won't match anything, */
 /* but will make other browsers ignore this rule. */
 x:-o-prefocus, body.rtl li#pt-uls {
-  /* @noflip */
-  direction: ltr;
+	/* @noflip */
+	direction: ltr;
 }
 
 #settings-block {
diff --git a/resources/css/ext.uls.displaysettings.css b/resources/css/ext.uls.displaysettings.css
index 5bc84b14..52cbb95c 100644
--- a/resources/css/ext.uls.displaysettings.css
+++ b/resources/css/ext.uls.displaysettings.css
@@ -67,7 +67,7 @@ div.display-settings-block {
 .uls-font-item {
 	border-bottom: 1px solid #EEEEEE;
 	background: #FBFBFB;
-	margin: 0 ;
+	margin: 0;
 	padding: 10px 0;
 }
 
diff --git a/tests/phpunit/LanguageSearchTest.php b/tests/phpunit/LanguageSearchTest.php
index f0c3a812..a543e8ea 100644
--- a/tests/phpunit/LanguageSearchTest.php
+++ b/tests/phpunit/LanguageSearchTest.php
@@ -17,7 +17,7 @@
  * @licence GNU General Public Licence 2.0 or later
  * @licence MIT License
  */
-require_once( __DIR__ . '/../../data/LanguageNameSearch.php' );
+require_once __DIR__ . '/../../data/LanguageNameSearch.php';
 class LanguageSearchTest extends PHPUnit_Framework_TestCase {
 
 	/**