diff --git a/index.php b/index.php
index fb064a3763..7789cc461c 100644
--- a/index.php
+++ b/index.php
@@ -122,7 +122,7 @@ if ($server > 0
     ) {
         echo '<li id="li_select_server" class="no_bullets" >';
         include_once 'libraries/select_server.lib.php';
-        echo PMA_Util::getImage('s_host.png')." ".PMA_selectServer(true, true);
+        echo PMA_Util::getImage('s_host.png') . " " . PMA_selectServer(true, true);
         echo '</li>';
     }
 
@@ -137,7 +137,7 @@ if ($server > 0
             if ($cfg['ShowChgPassword']) {
                 $conditional_class = 'ajax';
                 PMA_printListItem(
-                    PMA_Util::getImage('s_passwd.png')." ".__('Change password'),
+                    PMA_Util::getImage('s_passwd.png') . " " . __('Change password'),
                     'li_change_password',
                     'user_password.php?' . $common_url_query,
                     null,
@@ -152,7 +152,8 @@ if ($server > 0
         echo '        <form method="post" action="index.php">' . "\n"
            . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
            . '            <label for="select_collation_connection">' . "\n"
-           . '                '.PMA_Util::getImage('s_asci.png')." " . __('Server connection collation') . "\n"
+           . '                '. PMA_Util::getImage('s_asci.png') . " " 
+                               . __('Server connection collation') . "\n"
            // put the doc link in the form so that it appears on the same line
            . PMA_Util::showMySQLDocu(
                'MySQL_Database_Administration',
@@ -185,7 +186,7 @@ echo '  <ul>';
 if (empty($cfg['Lang']) && count($GLOBALS['available_languages']) > 1) {
     echo '<li id="li_select_lang" class="no_bullets">';
     include_once 'libraries/display_select_lang.lib.php';
-    echo PMA_Util::getImage('s_lang.png')." ".PMA_getLanguageSelectorHtml();
+    echo PMA_Util::getImage('s_lang.png') . " " . PMA_getLanguageSelectorHtml();
     echo '</li>';
 }
 
@@ -193,7 +194,8 @@ if (empty($cfg['Lang']) && count($GLOBALS['available_languages']) > 1) {
 
 if ($GLOBALS['cfg']['ThemeManager']) {
     echo '<li id="li_select_theme" class="no_bullets">';
-    echo PMA_Util::getImage('s_theme.png')." ".$_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
+    echo PMA_Util::getImage('s_theme.png') . " "
+            .  $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
     echo '</li>';
 }
 echo '<li id="li_select_fontsize">';
@@ -210,10 +212,10 @@ if ($server > 0) {
         PMA_Util::getImage('b_tblops.png')." " .__('More settings'),
         'li_user_preferences',
         'prefs_manage.php?' . $common_url_query,
-            null,
-            null,
-            null,
-            "no_bullets"
+        null,
+        null,
+        null,
+        "no_bullets"
     );
     echo '</ul>';
 }
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
index f0c5f9a906..1c92dc7636 100644
--- a/libraries/Message.class.php
+++ b/libraries/Message.class.php
@@ -78,7 +78,7 @@ class PMA_Message
         PMA_Message::NOTICE  => 'notice',
         PMA_Message::ERROR   => 'error',
     );
-    
+
     /**
      * The message number
      *
@@ -728,18 +728,20 @@ class PMA_Message
      * Returns the message with corresponding image icon
      * 
      * @param string $message the message(s)
+     * 
      * @return string message with icon
      */
-    public function getMessageWithIcon($message){
+    public function getMessageWithIcon($message)
+    {
         $image = '';
-        if('error' == $this->getLevel()){
+        if ('error' == $this->getLevel()) {
             $image = 's_error.png';
-        } elseif('success' == $this->getLevel()){
+        } elseif ('success' == $this->getLevel()) {
             $image = 's_success.png';
         } else {
             $image = 's_notice.png';
         }
-        $message = PMA_Message::notice(PMA_Util::getImage($image))." ".$message;
+        $message = PMA_Message::notice(PMA_Util::getImage($image)) . " " . $message;
         return $message;
         
     }
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 63430cde3a..228477c1fa 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -18,7 +18,11 @@ if ($is_create_db_priv) {
     // The user is allowed to create a db
     ?>
         <form method="post" action="db_create.php" id="create_database_form" class="ajax"><strong>
-            <?php echo '<label for="text_create_db">'. PMA_Util::getImage('b_newdb.png')." " . __('Create database') . '</label>&nbsp;' . PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
+            <?php echo '<label for="text_create_db">' 
+                       . PMA_Util::getImage('b_newdb.png')
+                       . " " . __('Create database')
+                       . '</label>&nbsp;'
+                       . PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
             <?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
             <input type="hidden" name="reload" value="1" />
             <input type="text" name="new_db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/>