diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ec46b8172..21361c340 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -73,9 +73,9 @@ class Monitoring_ListController extends Controller
             $stateColumn = 'host_hard_state';
             $stateChangeColumn = 'host_last_hard_state_change';
         } else {
+            $stateType = 'soft';
             $stateColumn = 'host_state';
             $stateChangeColumn = 'host_last_state_change';
-            $stateType = 'soft';
         }
 
         $this->addTitleTab('hosts');
@@ -148,7 +148,7 @@ class Monitoring_ListController extends Controller
             }
         }
         $this->setAutorefreshInterval(10);
-        
+
         $columns = array_merge(array(
             'host_name',
             'host_state',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index b29a5ab15..98661f4e6 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -10,9 +10,8 @@
 if (count($groupData) === 0) {
     echo t('No contacts matching the filter');
 }
-?>
 
-<?php foreach ($groupData as $groupName => $groupInfo): ?>
+foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
             <h2><?= $groupInfo['alias']; ?></h2>
 <?php if ($groupInfo['alias'] !== $groupName): ?>
@@ -31,8 +30,8 @@ if (count($groupData) === 0) {
                     <p>
 <?php if ($c->contact_email): ?>
                         <?= $c->contact_email; ?>
-<?php endif ?>
-<?php if ($c->contact_pager): ?>
+<?php endif;
+if ($c->contact_pager): ?>
                         <br />
                         <?= $c->contact_pager; ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 6a6e7a3f6..995a66001 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -4,9 +4,9 @@ $helper = $this->getHelper('CommandForm');
 <div class="controls">
 <?= $this->tabs ?>
 <div style="margin: 1em">
-<?=  $this->sortControl->render($this); ?>
+<?= $this->sortControl->render($this); ?>
 </div>
-<?=  $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
 <div class="content downtimes">
@@ -16,8 +16,7 @@ $helper = $this->getHelper('CommandForm');
 if (count($downtimes) === 0) {
     echo t('No downtimes matching the filter');
 }
-?>
-<?php foreach ($this->downtimes as $downtime): ?>
+foreach ($this->downtimes as $downtime): ?>
 <tr>
   <td>
     <?= $this->dateFormat()->formatDateTime($downtime->start); ?> -