diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 6b043ddc22..b14fb79174 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -266,9 +266,9 @@ class PMA_Config
      */
     function checkWebServer()
     {
+        // some versions return Microsoft-IIS, some Microsoft/IIS
+        // we could use a preg_match() but it's slower
         if (PMA_getenv('SERVER_SOFTWARE')
-            // some versions return Microsoft-IIS, some Microsoft/IIS
-            // we could use a preg_match() but it's slower
             && stristr(PMA_getenv('SERVER_SOFTWARE'), 'Microsoft')
             && stristr(PMA_getenv('SERVER_SOFTWARE'), 'IIS')
         ) {
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index e81be59b80..a9009ec19a 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -103,9 +103,9 @@ function PMA_analyseShowGrant()
                     continue;
                 }
 
+                // does this db exist?
                 if ((preg_match('/' . $re0 . '%|_/', $show_grants_dbname)
                     && ! preg_match('/\\\\%|\\\\_/', $show_grants_dbname))
-                    // does this db exist?
                     || (! PMA_DBI_try_query('USE ' .  preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $dbname_to_test))
                     && substr(PMA_DBI_getError(), 1, 4) != 1044)
                 ) {
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 4cd1d09fb0..d3b64065c4 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -223,9 +223,9 @@ function PMA_generate_common_url()
 
     $separator = PMA_get_arg_separator();
 
+    // avoid overwriting when creating navi panel links to servers
     if (isset($GLOBALS['server'])
         && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
-        // avoid overwriting when creating navi panel links to servers
         && ! isset($params['server'])
     ) {
         $params['server'] = $GLOBALS['server'];
diff --git a/sql.php b/sql.php
index 0dc0673b4f..3d3a5477f3 100644
--- a/sql.php
+++ b/sql.php
@@ -348,11 +348,11 @@ if (isset($btnDrop) && $btnDrop == __('No')) {
  *
  * Also bypassed if only showing php code.or validating a SQL query
  */
+// if we are coming from a "Create PHP code" or a "Without PHP Code"
+// dialog, we won't execute the query anyway, so don't confirm
 if (! $cfg['Confirm']
     || isset($_REQUEST['is_js_confirmed'])
     || isset($btnDrop)
-    // if we are coming from a "Create PHP code" or a "Without PHP Code"
-    // dialog, we won't execute the query anyway, so don't confirm
     || isset($GLOBALS['show_as_php'])
     || ! empty($GLOBALS['validatequery'])
 ) {
diff --git a/tbl_structure.php b/tbl_structure.php
index 75bbbbaad3..a56def33b1 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -424,8 +424,8 @@ foreach ($fields as $row) {
         ?>
     </td>
     <?php
+        // FULLTEXT is possible on TEXT, CHAR and VARCHAR
         if (! empty($tbl_storage_engine) && ($tbl_storage_engine == 'MYISAM' || $tbl_storage_engine == 'ARIA' || $tbl_storage_engine == 'MARIA' || ($tbl_storage_engine == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50604))
-            // FULLTEXT is possible on TEXT, CHAR and VARCHAR
             && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))
         ) {
             echo "\n";