diff --git a/libraries/server_databases.lib.php b/libraries/server_databases.lib.php
index 4def630f1d..053d28b252 100644
--- a/libraries/server_databases.lib.php
+++ b/libraries/server_databases.lib.php
@@ -312,10 +312,12 @@ function PMA_getHtmlForColumnOrderWithSort(
         . '    <th><a href="server_databases.php' 
         . PMA_generate_common_url($_url_params) . '">' . "\n"
         . '            ' . __('Database') . "\n"
-        . ($sort_by == 'SCHEMA_NAME' ? '                ' 
-        . PMA_Util::getImage(
-              's_' . $sort_order . '.png', 
-              ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : ''
+        . ($sort_by == 'SCHEMA_NAME' 
+            ? '                ' . PMA_Util::getImage(
+                's_' . $sort_order . '.png', 
+                ($sort_order == 'asc' ? __('Ascending') : __('Descending'))
+            ) . "\n" 
+            : ''
           )
         . '        </a></th>' . "\n";
     $table_columns = 3;
@@ -335,10 +337,12 @@ function PMA_getHtmlForColumnOrderWithSort(
                 . '<a href="server_databases.php' 
                 . PMA_generate_common_url($_url_params) . '">' . "\n"
                 . '            ' . $stat['disp_name'] . "\n"
-                . ($sort_by == $stat_name ? '            ' 
-                . PMA_Util::getImage(
-                      's_' . $sort_order . '.png', 
-                      ($sort_order == 'asc' ? __('Ascending') : __('Descending'))) . "\n" : ''
+                . ($sort_by == $stat_name 
+                    ? '            ' . PMA_Util::getImage(
+                        's_' . $sort_order . '.png', 
+                        ($sort_order == 'asc' ? __('Ascending') : __('Descending'))
+                    ) . "\n" 
+                    : ''
                   )
                 . '        </a></th>' . "\n";
         }
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index e0559d8096..e9a38974bf 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -184,7 +184,11 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
         //'Handler read key' => '> ',
     );
 
-    $retval .= PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatus);
+    $retval .= PMA_getHtmlForRenderVariables(
+        $ServerStatusData, 
+        $alerts, 
+        $strShowStatus
+    );
 
     return $retval;
 }
@@ -217,12 +221,15 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
     foreach ($ServerStatusData->status as $name => $value) {
         $odd_row = !$odd_row;
         $retval .= '<tr class="' . ($odd_row ? 'odd' : 'even')
-            . (isset($ServerStatusData->allocationMap[$name])?' s_' . $ServerStatusData->allocationMap[$name] : '')
+            . (isset($ServerStatusData->allocationMap[$name])
+                ?' s_' . $ServerStatusData->allocationMap[$name] 
+                : '')
             . '">';
 
         $retval .= '<th class="name">';
         $retval .= htmlspecialchars(str_replace('_', ' ', $name));
-        /* Fields containing % are calculated, they can not be described in MySQL documentation */
+        // Fields containing % are calculated, 
+        // they can not be described in MySQL documentation
         if (strpos($name, '%') === false) {
             $retval .= PMA_Util::showMySQLDocu(
                 'server-status-variables',