diff --git a/templates/columns_definitions/column_comment.phtml b/templates/columns_definitions/column_comment.phtml
index 52ab5886de..6008a74e68 100644
--- a/templates/columns_definitions/column_comment.phtml
+++ b/templates/columns_definitions/column_comment.phtml
@@ -3,8 +3,8 @@
        name="field_comments[<?= $columnNumber; ?>]"
        size="12"
        maxlength="<?= PMA_MYSQL_INT_VERSION >= 50503 ? 1024 : 255; ?>"
-       value="<?php if (isset($columnMeta['Field'])
-                            && is_array($comments_map)
-                            && isset($comments_map[$columnMeta['Field']]))
-           echo htmlspecialchars($comments_map[$columnMeta['Field']]); ?>"
+       value="<?= (isset($columnMeta['Field']) && is_array($comments_map) && isset($comments_map[$columnMeta['Field']])) ?
+                htmlspecialchars($comments_map[$columnMeta['Field']])
+                : ''
+              ?>"
        class="textfield" />
diff --git a/templates/columns_definitions/column_definitions_form.phtml b/templates/columns_definitions/column_definitions_form.phtml
index 22a1aece13..737ddb67a0 100644
--- a/templates/columns_definitions/column_definitions_form.phtml
+++ b/templates/columns_definitions/column_definitions_form.phtml
@@ -7,35 +7,39 @@ use PMA\libraries\StorageEngine;
       action="<?= $action; ?>"
       class="<?= ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form ajax lock-page">
     <?= PMA_URL_getHiddenInputs($form_params); ?>
+   <!-- happens when an index has been set on a column -->
+   <!-- and a column is added to the table creation dialog -->
+   <!-- This contains a JSON-encoded string -->
     <input type="hidden"
            name="primary_indexes"
-           value="<?php if (! empty($_REQUEST['primary_indexes'])) {
-                      // happens when an index has been set on a column,
-                      // and a column is added to the table creation dialog
-                      //
-                      // this contains a JSON-encoded string
-                      echo htmlspecialchars($_REQUEST['primary_indexes']);
-                    } else echo '[]'; ?>">
+           value="<?= (! empty($_REQUEST['primary_indexes'])) ?
+                      htmlspecialchars($_REQUEST['primary_indexes'])
+                      : '[]'
+                  ?>">
     <input type="hidden"
            name="unique_indexes"
-           value="<?php if (! empty($_REQUEST['unique_indexes'])) {
-                      echo htmlspecialchars($_REQUEST['unique_indexes']);
-                    } else echo '[]'; ?>">
+           value="<?= (! empty($_REQUEST['unique_indexes'])) ?
+                      htmlspecialchars($_REQUEST['unique_indexes'])
+                      : '[]'
+                  ?>">
     <input type="hidden"
            name="indexes"
-           value="<?php if (! empty($_REQUEST['indexes'])) {
-                      echo htmlspecialchars($_REQUEST['indexes']);
-                    } else echo '[]'; ?>">
+           value="<?= (! empty($_REQUEST['indexes'])) ?
+                      htmlspecialchars($_REQUEST['indexes'])
+                      : '[]'
+                  ?>">
     <input type="hidden"
            name="fulltext_indexes"
-           value="<?php if (! empty($_REQUEST['fulltext_indexes'])) {
-                      echo htmlspecialchars($_REQUEST['fulltext_indexes']);
-                    } else echo '[]'; ?>">
+           value="<?= (! empty($_REQUEST['fulltext_indexes'])) ?
+                      htmlspecialchars($_REQUEST['fulltext_indexes'])
+                      : '[]'
+                  ?>">
     <input type="hidden"
            name="spatial_indexes"
-           value="<?php if (! empty($_REQUEST['spatial_indexes'])) {
-                      echo htmlspecialchars($_REQUEST['spatial_indexes']);
-                    } else echo '[]'; ?>">
+           value="<?= (! empty($_REQUEST['spatial_indexes'])) ?
+                      htmlspecialchars($_REQUEST['spatial_indexes'])
+                      : '[]'
+                  ?>">
 
     <?php if ($action == 'tbl_create.php'): ?>
         <div id="table_name_col_no_outer">
@@ -46,7 +50,7 @@ use PMA\libraries\StorageEngine;
                            name="table"
                            size="40"
                            maxlength="64"
-                           value="<?= (isset($_REQUEST['table']) ? htmlspecialchars($_REQUEST['table']) : ''); ?>"
+                           value="<?= (isset($_REQUEST['table']) ? htmlspecialchars($_REQUEST['table']) : '') ?>"
                            class="textfield" autofocus required />
                     </td>
                     <td>
diff --git a/templates/columns_definitions/column_name.phtml b/templates/columns_definitions/column_name.phtml
index aa077ec8a1..b5cc26ba5b 100644
--- a/templates/columns_definitions/column_name.phtml
+++ b/templates/columns_definitions/column_name.phtml
@@ -29,8 +29,7 @@ if (empty($title)) {
        class="textfield"
        title="<?= $title; ?>"
        size="10"
-       value="<?php if (isset($columnMeta['Field']))
-           echo htmlspecialchars($columnMeta['Field']); ?>" />
+       value="<?= isset($columnMeta['Field'])? htmlspecialchars($columnMeta['Field']) : '' ?>" />
 
 <?php if ($cfgRelation['centralcolumnswork']
     && !(isset($columnMeta['column_status'])
diff --git a/templates/columns_definitions/column_type.phtml b/templates/columns_definitions/column_type.phtml
index 31caa0f5c1..196e30c5c3 100644
--- a/templates/columns_definitions/column_type.phtml
+++ b/templates/columns_definitions/column_type.phtml
@@ -1,7 +1,8 @@
 <select class="column_type"
         name="field_type[<?= $columnNumber; ?>]"
         id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-        <?php if (isset($columnMeta['column_status']) && !$columnMeta['column_status']['isEditable'])
-            echo 'disabled="disabled"'; ?>>
+        <?php if (isset($columnMeta['column_status']) && !$columnMeta['column_status']['isEditable']): ?>
+            disabled="disabled"
+        <?php endif; ?>>
     <?= PMA\libraries\Util::getSupportedDatatypes(true, $type_upper); ?>
 </select>
diff --git a/templates/columns_definitions/transformation_option.phtml b/templates/columns_definitions/transformation_option.phtml
index b046d12c07..598f0e6472 100644
--- a/templates/columns_definitions/transformation_option.phtml
+++ b/templates/columns_definitions/transformation_option.phtml
@@ -4,9 +4,6 @@
        name="field_<?= $options_key; ?>[<?= $columnNumber; ?>]"
        size="16"
        class="textfield"
-       value="<?php if (isset($columnMeta['Field'])
-           && isset($mime_map[$columnMeta['Field']][$options_key]))
-           echo htmlspecialchars(
-               $mime_map[$columnMeta['Field']]
-               [$options_key]
-           ); ?>" />
+       value="<?= (isset($columnMeta['Field']) && isset($mime_map[$columnMeta['Field']][$options_key])) ?
+                htmlspecialchars($mime_map[$columnMeta['Field']], [$options_key])
+                : '' ?>" />
diff --git a/templates/database/structure/show_create.phtml b/templates/database/structure/show_create.phtml
index 5dd5d1d166..c14d3467cd 100644
--- a/templates/database/structure/show_create.phtml
+++ b/templates/database/structure/show_create.phtml
@@ -12,28 +12,24 @@
         }
     ?>
     <?php if (! empty($tables)): ?>
-        <?php
-            echo PMA\libraries\Template::get('database/structure/show_create_row')->render(
-              array(
-                  'db' => $db,
-                  'title' => __('Tables'),
-                  'raw_title' => 'Table',
-                  'db_objects' => $tables
-              )
-            );
-        ?>
+        <?= PMA\libraries\Template::get('database/structure/show_create_row')->render(
+            array(
+              'db' => $db,
+              'title' => __('Tables'),
+              'raw_title' => 'Table',
+              'db_objects' => $tables
+            )
+        ) ?>
     <?php endif; ?>
 
     <?php if (! empty($views)): ?>
-        <?php
-        echo PMA\libraries\Template::get('database/structure/show_create_row')->render(
+        <?= PMA\libraries\Template::get('database/structure/show_create_row')->render(
             array(
                 'db' => $db,
                 'title' => __('Views'),
                 'raw_title' => 'View',
                 'db_objects' => $views
             )
-        );
-        ?>
+        ) ?>
     <?php endif; ?>
 </div>
diff --git a/templates/database/structure/structure_table_row.phtml b/templates/database/structure/structure_table_row.phtml
index 409cd1ee7c..aec7e78e2e 100644
--- a/templates/database/structure/structure_table_row.phtml
+++ b/templates/database/structure/structure_table_row.phtml
@@ -1,4 +1,4 @@
-<tr class="<?= $odd_row ? 'odd' : 'even'; ?> <?php if ($table_is_view) echo 'is_view'; ?>"
+<tr class="<?= ($odd_row ? 'odd' : 'even') , ($table_is_view ? ' is_view' : '') ?>"
     id="row_tbl_<?= $curr; ?>">
     <td class="center print_ignore">
         <input type="checkbox"
@@ -51,7 +51,7 @@
         </td>
         <td class="center print_ignore"><?= $empty_table; ?></td>
         <td class="center print_ignore">
-            <a class="ajax drop_table_anchor <?php if ($table_is_view || $current_table['ENGINE'] == null) echo 'view'; ?>"
+            <a class="ajax drop_table_anchor <?= ($table_is_view || $current_table['ENGINE'] == null) ? ' view' : '' ?>"
                href="sql.php<?= $tbl_url_query; ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?= urlencode($drop_query); ?>&amp;message_to_show=<?= urlencode($drop_message); ?>" >
                 <?= $titles['Drop']; ?>
             </a>
diff --git a/templates/list/item.phtml b/templates/list/item.phtml
index 863bf20ec7..54b66edb82 100644
--- a/templates/list/item.phtml
+++ b/templates/list/item.phtml
@@ -12,38 +12,30 @@
  *                        - title - optional string - Title of link
  */
 ?>
-<li<?php
-echo !empty($id) ? ' id="' . $id . '"' : null;
-echo !empty($class) ? ' class="' . $class . '"' : null;
-?>>
-    <?php
-    if (isset($url) && is_array($url) && array_filter($url)) : ?>
+<li <?= !empty($id) ? ' id="' . $id . '"' : null ?>
+    <?= !empty($class) ? ' class="' . $class . '"' : null ?>>
+
+    <?php if (isset($url) && is_array($url) && array_filter($url)) : ?>
         <a<?= !empty($url['href']) ? ' href="' . $url['href'] . '"' : null ?>
-        <?php
-        echo !empty($url['target'])
+        <?= !empty($url['target'])
             ? ' target="' . $url['target'] . '"'
             : null;
         ?>
         <?= !empty($url['id']) ? ' id="' . $url['id'] . '"' : null; ?>
-        <?php
-        echo !empty($url['class'])
+        <?= !empty($url['class'])
             ? ' class="' . $url['class'] . '"'
             : null;
         ?>
-        <?php
-        echo !empty($url['title'])
+        <?= !empty($url['title'])
             ? ' title="' . $url['title'] . '"'
             : null;
         ?>>
-        <?php
-    endif;
-    echo $content;
-    if (!empty($url) && is_array($url)) : ?>
+    <?php endif; ?>
+        <?= $content ?>
+    <?php if (!empty($url) && is_array($url)): ?>
         </a>
-    <?php
-    endif;
-    if (!empty($mysql_help_page)) :
-        echo PMA\libraries\Util::showMySQLDocu($mysql_help_page);
-    endif;
-    ?>
+    <?php endif; ?>
+    <?php if (!empty($mysql_help_page)): ?>
+        <?= PMA\libraries\Util::showMySQLDocu($mysql_help_page) ?>
+    <?php endif; ?>
 </li>
diff --git a/templates/list/unordered.phtml b/templates/list/unordered.phtml
index 32198c7ce5..9f71914154 100644
--- a/templates/list/unordered.phtml
+++ b/templates/list/unordered.phtml
@@ -9,21 +9,19 @@
  * $content - mandatory string - Content to display if $item is empty
  */
 ?>
-<ul<?php
-echo !empty($class) ? ' class="' . $class . '"' : null;
-echo !empty($id) ? ' id="' . $id . '"' : null;
-?>>
-    <?php
-    if (!empty($items)) :
-        foreach ($items as $item) :
-            if (!is_array($item)) {
-                $item = array('content' => $item);
-            }
-            echo PMA\libraries\Template::get('list/item')
-                ->render($item);
-        endforeach;
-    elseif (!empty($content)) :
-        echo $content;
-    endif;
-    ?>
-</ul>
\ No newline at end of file
+<ul<?= !empty($class) ? ' class="' . $class . '"' : null ?>
+    <?= !empty($id) ? ' id="' . $id . '"' : null ?>>
+
+    <?php if (!empty($items)): ?>
+        <?php foreach ($items as $item): ?>
+            <?php if (!is_array($item)): ?>
+                <?php $item = array('content' => $item) ?>
+            <?php endif; ?>
+            <?= PMA\libraries\Template::get('list/item')
+                ->render($item)
+            ?>
+        <?php endforeach; ?>
+    <?php elseif (!empty($content)): ?>
+        <?= $content ?>
+    <?php endif; ?>
+</ul>
diff --git a/templates/prefs_autoload.phtml b/templates/prefs_autoload.phtml
index 860bdd3d40..2308b1668c 100644
--- a/templates/prefs_autoload.phtml
+++ b/templates/prefs_autoload.phtml
@@ -4,12 +4,10 @@
         <input type="hidden" name="json" value="" />
         <input type="hidden" name="submit_import" value="1" />
         <input type="hidden" name="return_url" value="<?= $return_url ?>" />
-        <?php
-        echo __(
+        <?= __(
             'Your browser has phpMyAdmin configuration for this domain. '
             . 'Would you like to import it for current session?'
-        );
-        ?>
+        ) ?>
         <br />
         <a href="#yes"><?= __('Yes') ?></a>
         / <a href="#no"><?= __('No') ?></a>
diff --git a/templates/server/variables/link_template.phtml b/templates/server/variables/link_template.phtml
index 306d22434a..73b8774c7b 100644
--- a/templates/server/variables/link_template.phtml
+++ b/templates/server/variables/link_template.phtml
@@ -4,10 +4,8 @@
 <a style="display: none;" href="#" class="cancelLink">
     <?= \PMA\libraries\Util::getIcon('b_close.png', __('Cancel')); ?>
 </a>
-<?php
-echo \PMA\libraries\Util::getImage(
+<?= \PMA\libraries\Util::getImage(
     'b_help.png',
     __('Documentation'),
     array('style' => 'display:none', 'id' => 'docImage')
-);
-?>
+) ?>
diff --git a/templates/server/variables/variable_row.phtml b/templates/server/variables/variable_row.phtml
index a6d7e4bfb0..064e42d37d 100644
--- a/templates/server/variables/variable_row.phtml
+++ b/templates/server/variables/variable_row.phtml
@@ -11,10 +11,9 @@
     <td class="var-name">
     <?php if ($docLink != null): ?>
         <span title="<?= htmlspecialchars(str_replace('_', ' ', $name)); ?>">
-            <?php
-                echo \PMA\libraries\Util::showMySQLDocu($docLink[1], false, $docLink[2] . '_' . $docLink[0], true);
-                echo htmlspecialchars(str_replace('_', ' ', $name));
-                echo '</a>';
+            <?= \PMA\libraries\Util::showMySQLDocu($docLink[1], false, $docLink[2] . '_' . $docLink[0], true)
+                , htmlspecialchars(str_replace('_', ' ', $name))
+                , '</a>'
             ?>
         </span>
     <?php else: ?>
diff --git a/templates/table/chart/tbl_chart.phtml b/templates/table/chart/tbl_chart.phtml
index e00f01bbed..c01b9c0efe 100644
--- a/templates/table/chart/tbl_chart.phtml
+++ b/templates/table/chart/tbl_chart.phtml
@@ -83,19 +83,20 @@
                         <?php endif; ?>
                     <?php endforeach;?>
                 </select>
-                <input type="hidden" name="dateTimeCols" value="<?php $date_time_types = array('date', 'datetime', 'timestamp');
-                    foreach ($keys as $idx => $key) {
-                        if (in_array($fields_meta[$idx]->type, $date_time_types)) {
-                            echo $idx , ' ';
-                        }
-                    }?>"
+                <input type="hidden" name="dateTimeCols" value="
+                    <?php $date_time_types = array('date', 'datetime', 'timestamp'); ?>
+                    <?php foreach ($keys as $idx => $key): ?>
+                        <?php if (in_array($fields_meta[$idx]->type, $date_time_types)): ?>
+                            <?= $idx , ' ' ?>
+                        <?php endif; ?>
+                    <?php endforeach; ?>"
                 />
-                <input type="hidden" name="numericCols" value="<?php
-                    foreach ($keys as $idx => $key) {
-                        if (in_array($fields_meta[$idx]->type, $numeric_types)) {
-                            echo $idx , ' ';
-                        }
-                    }?>"
+                <input type="hidden" name="numericCols" value="
+                    <?php foreach ($keys as $idx => $key): ?>
+                        <?php if (in_array($fields_meta[$idx]->type, $numeric_types)): ?>
+                            <?= $idx , ' ' ?>
+                        <?php endif; ?>
+                    <?php endforeach; ?>"
                 />
             </div>
             <div class="chartOption">
@@ -120,10 +121,12 @@
                 </label>
                 <select name="chartSeriesColumn" id="select_seriesColumn" disabled>
                     <?php foreach ($keys as $idx => $key) : ?>
-                        <option value="<?= htmlspecialchars($idx);
-                        if ($idx == 1) : echo ' selected="selected"'; endif;
-                        $seriesColumn = $idx; ?>">
-                            <?= htmlspecialchars($key); ?>
+                        <option value="<?= htmlspecialchars($idx) ?>"
+                            <?php if ($idx == 1): ?>
+                                selected="selected"
+                            <?php endif; ?>
+                            <?php $seriesColumn = $idx; ?>">
+                                <?= htmlspecialchars($key); ?>
                         </option>
                     <?php endforeach; ?>
                 </select>
diff --git a/templates/table/gis_visualization/gis_visualization.phtml b/templates/table/gis_visualization/gis_visualization.phtml
index 5663374444..36c358b10d 100644
--- a/templates/table/gis_visualization/gis_visualization.phtml
+++ b/templates/table/gis_visualization/gis_visualization.phtml
@@ -32,7 +32,9 @@
                             <input type="checkbox"
                                    name="visualizationSettings[choice]"
                                    id="choice" value="useBaseLayer"
-                                   <?php if (isset($visualizationSettings['choice'])) echo 'checked="checked"' ?>/>
+                                   <?php if (isset($visualizationSettings['choice'])): ?>
+                                        checked="checked"
+                                   <?php endif; ?>/>
                             <label for="choice" id="labelChoice">
                                 <?= __("Use OpenStreetMaps as Base Layer"); ?>
                             </label>
diff --git a/templates/table/index_form.phtml b/templates/table/index_form.phtml
index bf9ddf9a92..90c4ecef28 100644
--- a/templates/table/index_form.phtml
+++ b/templates/table/index_form.phtml
@@ -162,7 +162,9 @@
                                             || in_array($field_type, $spatial_types))): ?>
 
                                         <option value="<?= htmlspecialchars($field_name) ?>"
-                                                <?php if ($field_name == $column->getName()) echo 'selected="selected"'; ?>>
+                                                <?php if ($field_name == $column->getName()): ?>
+                                                    selected="selected"
+                                                <?php endif; ?>>
 
                                             <?= htmlspecialchars($field_name); ?> [<?= htmlspecialchars($field_type); ?>]
                                         </option>
@@ -174,7 +176,10 @@
                             <input type="text"
                                    size="5"
                                    onfocus="this.select()"name="index[columns][sub_parts][]"
-                                   value="<?php if ($index->getChoice() != 'SPATIAL') echo $column->getSubPart(); ?>"/>
+                                   value="<?= ($index->getChoice() != 'SPATIAL') ?
+                                       $column->getSubPart()
+                                       : ''
+                                    ?>" />
                         </td>
                     </tr>
 
@@ -202,7 +207,7 @@
                                     } ?>
 
                                     <option value="<?= htmlspecialchars((isset($col_index)) ? $col_index : $field_name); ?>"
-                                            <?= ($j++ == $i ? 'selected="selected"' : ''); ?>>
+                                            <?= ($j++ == $i ? ' selected="selected"' : ''); ?>>
                                         <?= htmlspecialchars($field_name) ?> [<?= htmlspecialchars($field_type); ?>]
                                     </option>
                                     <?= "\n";
diff --git a/templates/table/relation/common_form.phtml b/templates/table/relation/common_form.phtml
index 4f53947c31..ef048f9bb2 100644
--- a/templates/table/relation/common_form.phtml
+++ b/templates/table/relation/common_form.phtml
@@ -8,11 +8,10 @@
                 <tr>
                     <th><?= __('Actions'); ?></th>
                     <th><?= __('Constraint properties'); ?></th>
-                    <th><?php
-                        echo __('Column') , PMA\libraries\Util::showHint(__(
-                                'Only columns with index will be displayed. You can define an'
-                                . ' index below.'
-                            )) ?>
+                    <th><?= __('Column') , PMA\libraries\Util::showHint(__(
+                            'Only columns with index will be displayed. You can define an'
+                            . ' index below.'
+                        )) ?>
                     </th>
                     <th colspan="3">
                         <?= __('Foreign key constraint'); ?> (<?= $tbl_storage_engine; ?>)
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index 3623359cf3..f777e301a7 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -79,8 +79,10 @@ if ($foreign_db) {
     <td>
         <span class="formelement clearfloat">
             <input type="text" name="constraint_name[<?= $i; ?>]"
-                   value="<?php if (isset($one_key['constraint']))
-                       echo htmlspecialchars($one_key['constraint']); ?>"
+                   value="<?= (isset($one_key['constraint'])) ?
+                       htmlspecialchars($one_key['constraint'])
+                       : ''
+                       ?>"
                    placeholder="<?= __('Constraint name'); ?>"
                    maxlength="64" />
         </span>
diff --git a/templates/table/search/fields_table.phtml b/templates/table/search/fields_table.phtml
index 69903422c7..a5f725b74e 100644
--- a/templates/table/search/fields_table.phtml
+++ b/templates/table/search/fields_table.phtml
@@ -1,4 +1,6 @@
-<table class="data" <?php if ($searchType == 'zoom') echo 'id="tableFieldsId"'; ?>>
+<table class="data" <?php if ($searchType == 'zoom'): ?>
+                        id="tableFieldsId"
+                   <?php endif; ?>>
     <?= PMA\libraries\Template::get('table/search/table_header')
         ->render(array(
             'geomColumnFlag' => $geomColumnFlag
@@ -9,7 +11,7 @@
             ->render(array(
                 'self' => $self,
                 'columnNames' => $columnNames
-            )); ?>
+        )) ?>
     <?php else: ?>
         <?= PMA\libraries\Template::get('table/search/rows_normal')
             ->render(array(
@@ -18,7 +20,7 @@
                 'columnNames' => $columnNames,
                 'columnTypes' => $columnTypes,
                 'columnCollations' => $columnCollations
-            )); ?>
+        )) ?>
     <?php endif; ?>
     </tbody>
 </table>
diff --git a/templates/table/search/input_box.phtml b/templates/table/search/input_box.phtml
index 26f4602e1e..1503472697 100644
--- a/templates/table/search/input_box.phtml
+++ b/templates/table/search/input_box.phtml
@@ -5,11 +5,11 @@ if ($_foreigners
     && PMA_searchColumnInForeigners($_foreigners, $column_name)): ?>
     <?php if (is_array($foreignData['disp_row'])): ?>
         <select name="criteriaValues[<?= $column_index; ?>]"
-                id="<?= $column_id , $column_index; ?>">
+                id="<?= $column_id , $column_index ?>">
             <?= PMA_foreignDropdown(
                 $foreignData['disp_row'], $foreignData['foreign_field'],
                 $foreignData['foreign_display'], '', $foreignMaxLimit
-            ); ?>
+            ) ?>
         </select>
     <?php elseif ($foreignData['foreign_link'] == true): ?>
         <input type="text"
@@ -23,15 +23,12 @@ if ($_foreigners
                    value="<?= $criteriaValues[$column_index]; ?>"
                <?php endif; ?> />
         <a class="ajax browse_foreign"
-           href="browse_foreigners.php<?php
-               echo PMA_URL_getCommon(
-                   array('db' => $db, 'table' => $table)
-               );
-           ?>&amp;field=<?php
-               echo urlencode($column_name);
-           ?>&amp;fieldkey=<?php
-               echo $column_index;
-           ?>&amp;fromsearch=1">
+           href="<?= ('browse_foreigners.php') , PMA_URL_getCommon(array('db' => $db, 'table' => $table))
+                    , ('&amp;field=') , urlencode($column_name)
+                    , ('&amp;fieldkey=') , $column_index
+                    , ('&amp;fromsearch=1')
+                ?>">
+
             <?= str_replace("'", "\\'", $titles['Browse']); ?>
         </a>
     <?php endif; ?>
diff --git a/templates/table/search/selection_form.phtml b/templates/table/search/selection_form.phtml
index cf8ba5c224..e33556015d 100644
--- a/templates/table/search/selection_form.phtml
+++ b/templates/table/search/selection_form.phtml
@@ -19,12 +19,13 @@
                     'columnNames' => $columnNames,
                     'columnTypes' => $columnTypes,
                     'columnCollations' => $columnCollations
-                ));
-            echo PMA\libraries\Template::get('table/search/options_zoom')
+                ))
+            ?>
+            <?= PMA\libraries\Template::get('table/search/options_zoom')
                 ->render(array(
                     'dataLabel' => $dataLabel,
                     'columnNames' => $columnNames
-                )); ?>
+            )) ?>
         </fieldset>
     </fieldset>
 <?php elseif ($searchType == 'normal'): ?>
@@ -71,7 +72,9 @@
 <fieldset class="tblFooters">
     <input type="submit"
            name="<?= ($searchType == 'zoom' ? 'zoom_submit' : 'submit'); ?>"
-           <?php if ($searchType == 'zoom') echo ' id="inputFormSubmitId"'; ?>
+           <?php if ($searchType == 'zoom'): ?>
+               id="inputFormSubmitId"
+           <?php endif; ?>
            value="<?= __('Go'); ?>" />
 </fieldset>
 </form>
diff --git a/templates/table/search/zoom_result_form.phtml b/templates/table/search/zoom_result_form.phtml
index a6d17f2cbc..a6580f351d 100644
--- a/templates/table/search/zoom_result_form.phtml
+++ b/templates/table/search/zoom_result_form.phtml
@@ -73,8 +73,7 @@
                         </th>
 <!-- Column's Input box-->
                         <th>
-                            <?php
-                            echo PMA\libraries\Template::get('table/search/input_box')->render(array(
+                            <?= PMA\libraries\Template::get('table/search/input_box')->render(array(
                                     'str' => '',
                                     'column_type' => $_columnTypes[$column_index],
                                     'column_id' => ($_columnTypes[$column_index]) ? 'edit_fieldID_' : 'fieldID_',
diff --git a/templates/table/structure/actions_in_table_structure.phtml b/templates/table/structure/actions_in_table_structure.phtml
index f8bff5365f..89e970f974 100644
--- a/templates/table/structure/actions_in_table_structure.phtml
+++ b/templates/table/structure/actions_in_table_structure.phtml
@@ -1,9 +1,8 @@
 <td class="print_ignore"><ul class="table-structure-actions resizable-menu">
     <!-- Add primary -->
-    <?php
-    use PMA\libraries\Util;
+    <?php use PMA\libraries\Util; ?>
 
-    echo PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
+    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
             array(
                 'type' => $type,
                 'tbl_storage_engine' => $tbl_storage_engine,
@@ -19,11 +18,10 @@
                 'row' => $row,
                 'isPrimary' => true
             )
-        );
+        )
     ?>
     <!-- Add unique -->
-    <?php
-        echo PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
+    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
             array(
                 'type' => $type,
                 'tbl_storage_engine' => $tbl_storage_engine,
@@ -39,11 +37,10 @@
                 'row' => $row,
                 'isPrimary' => false
             )
-        );
+        )
     ?>
     <!-- Add index -->
-    <?php
-        echo PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
+    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
             array(
                 'type' => $type,
                 'tbl_storage_engine' => $tbl_storage_engine,
@@ -59,16 +56,16 @@
                 'row' => $row,
                 'isPrimary' => false
             )
-        );
+        )
     ?>
 
     <!-- Add spatial -->
-    <?php
-        $spatial_types = array(
+    <?php $spatial_types = array(
             'geometry', 'point', 'linestring', 'polygon', 'multipoint',
             'multilinestring', 'multipolygon', 'geomtrycollection'
         );
-        echo PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
+    ?>
+    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
             array(
                 'type' => $type,
                 'tbl_storage_engine' => $tbl_storage_engine,
@@ -84,7 +81,7 @@
                 'row' => $row,
                 'isPrimary' => false
             )
-        );
+        )
     ?>
     <!-- FULLTEXT is possible on TEXT, CHAR and VARCHAR -->
     <li class="fulltext nowrap">
diff --git a/templates/table/structure/check_all_table_column.phtml b/templates/table/structure/check_all_table_column.phtml
index c8d1cc257d..454e23226c 100644
--- a/templates/table/structure/check_all_table_column.phtml
+++ b/templates/table/structure/check_all_table_column.phtml
@@ -1,35 +1,33 @@
 <div class="print_ignore" >
-    <?= PMA\libraries\Util::getWithSelected($pmaThemeImage, $text_dir, "fieldsForm"); ?>
+    <?= PMA\libraries\Util::getWithSelected($pmaThemeImage, $text_dir, "fieldsForm") ?>
     <?= PMA\libraries\Util::getButtonOrImage(
     'submit_mult', 'mult_submit', 'submit_mult_browse',
     __('Browse'), 'b_browse.png', 'browse'
-    ); ?>
+    ) ?>
 
     <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
         <?= PMA\libraries\Util::getButtonOrImage(
         'submit_mult', 'mult_submit change_columns_anchor ajax',
         'submit_mult_change', __('Change'), 'b_edit.png', 'change'
-        ); ?>
+        ) ?>
         <?= PMA\libraries\Util::getButtonOrImage(
         'submit_mult', 'mult_submit', 'submit_mult_drop',
         __('Drop'), 'b_drop.png', 'drop'
-        ); ?>
+        ) ?>
 
         <?php if ('ARCHIVE' != $tbl_storage_engine): ?>
-            <?php
-                echo PMA\libraries\Util::getButtonOrImage(
-                    'submit_mult', 'mult_submit', 'submit_mult_primary',
-                    __('Primary'), 'b_primary.png', 'primary'
-                );
-                echo PMA\libraries\Util::getButtonOrImage(
-                    'submit_mult', 'mult_submit', 'submit_mult_unique',
-                    __('Unique'), 'b_unique.png', 'unique'
-                );
-                echo PMA\libraries\Util::getButtonOrImage(
-                    'submit_mult', 'mult_submit', 'submit_mult_index',
-                    __('Index'), 'b_index.png', 'index'
-                );
-            ?>
+            <?= PMA\libraries\Util::getButtonOrImage(
+                'submit_mult', 'mult_submit', 'submit_mult_primary',
+                __('Primary'), 'b_primary.png', 'primary'
+            ) ?>
+            <?= PMA\libraries\Util::getButtonOrImage(
+                'submit_mult', 'mult_submit', 'submit_mult_unique',
+                __('Unique'), 'b_unique.png', 'unique'
+            ) ?>
+            <?= PMA\libraries\Util::getButtonOrImage(
+                'submit_mult', 'mult_submit', 'submit_mult_index',
+                __('Index'), 'b_index.png', 'index'
+            ) ?>
 
             <?php if (! empty($tbl_storage_engine)
                         && ($tbl_storage_engine == 'MYISAM'
@@ -38,19 +36,20 @@
                 <?= PMA\libraries\Util::getButtonOrImage(
                     'submit_mult', 'mult_submit', 'submit_mult_fulltext',
                     __('Fulltext'), 'b_ftext.png', 'ftext'
-                ); ?>
+                ) ?>
             <?php endif; ?>
 
             <?php if ($GLOBALS['cfgRelation']['centralcolumnswork']): ?>
-                <?php
-                echo PMA\libraries\Util::getButtonOrImage(
+                <?= PMA\libraries\Util::getButtonOrImage(
                     'submit_mult', 'mult_submit', 'submit_mult_central_columns_add',
                     __('Add to central columns'), 'centralColumns_add.png',
-                    'add_to_central_columns');
-                echo PMA\libraries\Util::getButtonOrImage(
+                    'add_to_central_columns'
+                ) ?>
+                <?= PMA\libraries\Util::getButtonOrImage(
                     'submit_mult', 'mult_submit', 'submit_mult_central_columns_remove',
                     __('Remove from central columns'), 'centralColumns_delete.png',
-                    'remove_from_central_columns'); ?>
+                    'remove_from_central_columns'
+                ) ?>
             <?php endif; ?>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/templates/table/structure/display_partitions.phtml b/templates/table/structure/display_partitions.phtml
index 007bcf491c..5a88c6d477 100644
--- a/templates/table/structure/display_partitions.phtml
+++ b/templates/table/structure/display_partitions.phtml
@@ -38,7 +38,7 @@ use PMA\libraries\Util; ?>
                 <tbody>
                 <?php $odd = true; ?>
                 <?php foreach ($partitions as $partition): ?>
-                    <tr class="noclick <?= $odd ? 'odd' : 'even'; echo $hasSubPartitions ? ' marked' : '';?>">
+                    <tr class="noclick <?= ($odd ? 'odd' : 'even') , ($hasSubPartitions ? ' marked' : '') ?>">
                         <?php if ($hasSubPartitions): ?>
                             <td><?= $partition->getOrdinal(); ?></td>
                             <td></td>
@@ -49,8 +49,7 @@ use PMA\libraries\Util; ?>
                         <?php if ($hasDescription): ?>
                             <td>
                                 <code>
-                                    <?php
-                                    echo htmlspecialchars($partition->getExpression())
+                                    <?= htmlspecialchars($partition->getExpression())
                                         , ($partition->getMethod() == 'LIST' ? ' IN (' : ' < ')
                                         , htmlspecialchars($partition->getDescription())
                                         , ($partition->getMethod() == 'LIST' ? ')' : '');
diff --git a/templates/table/structure/display_table_stats.phtml b/templates/table/structure/display_table_stats.phtml
index 0c194c258d..1cd649f8a4 100644
--- a/templates/table/structure/display_table_stats.phtml
+++ b/templates/table/structure/display_table_stats.phtml
@@ -64,8 +64,7 @@
                 </tbody>
             </table>
         <?php endif; ?>
-        <?php
-            echo PMA\libraries\Template::get('table/structure/row_stats_table')->render(
+        <?= PMA\libraries\Template::get('table/structure/row_stats_table')->render(
               array(
                   'showtable' => $showtable,
                   'tbl_collation' => $tbl_collation,
@@ -74,7 +73,7 @@
                   'avg_size' => (isset ($avg_size) ? $avg_size : ''),
                   'avg_unit' => (isset ($avg_unit) ? $avg_unit : '')
               )
-            );
+            )
         ?>
     </fieldset>
 </div>
diff --git a/templates/table/structure/table_structure_header.phtml b/templates/table/structure/table_structure_header.phtml
index fbec6dced8..e5c41dde4d 100644
--- a/templates/table/structure/table_structure_header.phtml
+++ b/templates/table/structure/table_structure_header.phtml
@@ -2,9 +2,9 @@
 <tr>
     <th class="print_ignore"></th>
     <th>#</th>
-    <th><?php use PMA\libraries\Util;
+    <th><?php use PMA\libraries\Util; ?>
 
-        echo __('Name'); ?></th>
+        <?= __('Name'); ?></th>
     <th><?= __('Type'); ?></th>
     <th><?= __('Collation'); ?></th>
     <th><?= __('Attributes'); ?></th>