diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index 8583bfc59..9d5da0648 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -1,17 +1,17 @@
 <?php if ($comment->objecttype === 'service'): ?>
-    <?= $this->icon('service', $this->translate('Service')); ?>
+    <?= $this->icon('service', $this->translate('Service')) ?>
     <?= sprintf(
         '%s: %s',
         $comment->host_display_name,
         $comment->service_display_name
     ) ?>
 <?php else: ?>
-    <?= $this->icon('host', $this->translate('Host')); ?>
-    <?= $this->link()->host($comment->host_name, $comment->host_display_name); ?>
+    <?= $this->icon('host', $this->translate('Host')) ?>
+    <?= $this->link()->host($comment->host_name, $comment->host_display_name) ?>
 <?php endif ?>
-
 <br>
-<?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
-  ? '[' . $this->escape($comment->author) . '] '
-  : '';
-?><?= $this->escape($comment->comment); ?>
+<?= $this->icon('comment', $this->translate('Comment')) ?>
+<?php if (isset($comment->author)): ?>
+    [<?= $this->escape($comment->author) ?>]
+<?php endif ?>
+<?= $this->escape($comment->comment) ?>