diff --git a/src/Template/Cell/TablesList/display.ctp b/src/Template/Cell/TablesList/display.ctp
index d8dc932f..3bbed1d4 100644
--- a/src/Template/Cell/TablesList/display.ctp
+++ b/src/Template/Cell/TablesList/display.ctp
@@ -7,4 +7,3 @@ foreach ($tables as $table => $config) {
     ]); ?></li>
     <?php
 }
-?>
diff --git a/src/Template/Element/action-groups.ctp b/src/Template/Element/action-groups.ctp
index 846a84ec..a820a8bd 100644
--- a/src/Template/Element/action-groups.ctp
+++ b/src/Template/Element/action-groups.ctp
@@ -28,5 +28,5 @@ foreach ($groups as $key => $group) {
             <?php endforeach; ?>
        </ul>
    </div>
-<?php endforeach; ?>
-
+<?php
+endforeach;
diff --git a/src/Template/Element/actions.ctp b/src/Template/Element/actions.ctp
index b98469a4..950473a5 100644
--- a/src/Template/Element/actions.ctp
+++ b/src/Template/Element/actions.ctp
@@ -78,4 +78,3 @@ unset($actionGroups['primary']);
 
 // render grouped actions
 echo $this->element('action-groups', ['groups' => $actionGroups, 'links' => $links]);
-?>
diff --git a/src/Template/Element/index/bulk_actions/form_end.ctp b/src/Template/Element/index/bulk_actions/form_end.ctp
index 64090c85..4cdd2035 100644
--- a/src/Template/Element/index/bulk_actions/form_end.ctp
+++ b/src/Template/Element/index/bulk_actions/form_end.ctp
@@ -23,4 +23,3 @@ echo $this->Form->input('action', [
     'class' => 'no-selectize'
 ]);
 echo $this->Form->end();
-?>
diff --git a/src/Template/Element/index/bulk_actions/form_start.ctp b/src/Template/Element/index/bulk_actions/form_start.ctp
index d3afb833..edc7ca15 100644
--- a/src/Template/Element/index/bulk_actions/form_start.ctp
+++ b/src/Template/Element/index/bulk_actions/form_start.ctp
@@ -6,4 +6,3 @@ if (empty($bulkActions)) {
 echo $this->Form->create(null, [
     'class' => 'bulk-actions form-horizontal'
 ]);
-?>
diff --git a/src/Template/Element/view/related/has_many.ctp b/src/Template/Element/view/related/has_many.ctp
index 1700a664..68c7f6e1 100644
--- a/src/Template/Element/view/related/has_many.ctp
+++ b/src/Template/Element/view/related/has_many.ctp
@@ -70,4 +70,5 @@ foreach ($relations as $alias => $details):
             </ul>
         </div>
     </div>
-<?php endforeach; ?>
+<?php
+endforeach;
diff --git a/src/View/Helper/CrudViewHelper.php b/src/View/Helper/CrudViewHelper.php
index 31f6ae8e..a465f2b8 100644
--- a/src/View/Helper/CrudViewHelper.php
+++ b/src/View/Helper/CrudViewHelper.php
@@ -265,6 +265,7 @@ public function relation($field)
             }
 
             $entity = $data->$entityName;
+
             return [
                 'alias' => $alias,
                 'output' => $this->Html->link($entity->{$details['displayField']}, [