diff --git a/modules/mod_menu/tmpl/default.php b/modules/mod_menu/tmpl/default.php
index 52066b326d2a6..bd467d2d856b3 100644
--- a/modules/mod_menu/tmpl/default.php
+++ b/modules/mod_menu/tmpl/default.php
@@ -19,83 +19,49 @@
 // The menu class is deprecated. Use nav instead
 ?>
 <ul class="nav menu<?php echo $class_sfx; ?>"<?php echo $id; ?>>
-<?php foreach ($list as $i => &$item)
-{
-	$class = 'item-' . $item->id;
-
-	if ($item->id == $default_id)
-	{
-		$class .= ' default';
-	}
-
-	if ($item->id == $active_id || ($item->type === 'alias' && $item->params->get('aliasoptions') == $active_id))
-	{
-		$class .= ' current';
-	}
-
-	if (in_array($item->id, $path))
-	{
-		$class .= ' active';
-	}
-	elseif ($item->type === 'alias')
-	{
-		$aliasToId = $item->params->get('aliasoptions');
-
-		if (count($path) > 0 && $aliasToId == $path[count($path) - 1])
-		{
-			$class .= ' active';
-		}
-		elseif (in_array($aliasToId, $path))
-		{
-			$class .= ' alias-parent-active';
-		}
-	}
-
-	if ($item->type === 'separator')
-	{
-		$class .= ' divider';
-	}
-
-	if ($item->deeper)
-	{
-		$class .= ' deeper';
-	}
-
-	if ($item->parent)
-	{
-		$class .= ' parent';
-	}
-
-	echo '<li class="' . $class . '">';
-
-	switch ($item->type) :
-		case 'separator':
-		case 'component':
-		case 'heading':
-		case 'url':
-			require JModuleHelper::getLayoutPath('mod_menu', 'default_' . $item->type);
-			break;
-
-		default:
-			require JModuleHelper::getLayoutPath('mod_menu', 'default_url');
-			break;
-	endswitch;
-
-	// The next item is deeper.
-	if ($item->deeper)
-	{
-		echo '<ul class="nav-child unstyled small">';
-	}
-	// The next item is shallower.
-	elseif ($item->shallower)
-	{
-		echo '</li>';
-		echo str_repeat('</ul></li>', $item->level_diff);
-	}
-	// The next item is on the same level.
-	else
-	{
-		echo '</li>';
-	}
-}
-?></ul>
+	<?php foreach ($list as $i => &$item) : ?>
+		<?php $class = 'item-' . $item->id; ?>
+		<?php if ($item->id == $default_id) : ?>
+			<?php $class .= ' default'; ?>
+		<?php endif; ?>
+		<?php if ($item->id == $active_id || ($item->type === 'alias' && $item->params->get('aliasoptions') == $active_id)) : ?>
+			<?php $class .= ' current'; ?>
+		<?php endif; ?>
+		<?php if (in_array($item->id, $path)) : ?>
+			<?php $class .= ' active'; ?>
+		<?php elseif ($item->type === 'alias') : ?>
+			<?php $aliasToId = $item->params->get('aliasoptions'); ?>
+			<?php if (count($path) > 0 && $aliasToId == $path[count($path) - 1]) : ?>
+				<?php $class .= ' active'; ?>
+			<?php elseif (in_array($aliasToId, $path)) : ?>
+				<?php $class .= ' alias-parent-active'; ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<?php if ($item->type === 'separator') : ?>
+			<?php $class .= ' divider'; ?>
+		<?php endif; ?>
+		<?php if ($item->deeper) : ?>
+			<?php $class .= ' deeper'; ?>
+		<?php endif; ?>
+		<?php if ($item->parent) : ?>
+			<?php $class .= ' parent'; ?>
+		<?php endif; ?>
+		<li class="<?php echo $class; ?>">
+			<?php if (in_array($item->type, array('separator', 'component', 'heading', 'url'))) : ?>
+				<?php require JModuleHelper::getLayoutPath('mod_menu', 'default_' . $item->type); ?>
+			<?php else : ?>
+				<?php require JModuleHelper::getLayoutPath('mod_menu', 'default_url'); ?>
+			<?php endif; ?>
+			<?php // The next item is deeper. ?>
+			<?php if ($item->deeper) : ?>
+				<ul class="nav-child unstyled small">
+			<?php elseif ($item->shallower) : ?>
+				<?php // The next item is shallower. ?>
+				</li>
+				<?php echo str_repeat('</ul></li>', $item->level_diff); ?>
+			<?php else : ?>
+				<?php // The next item is on the same level. ?>
+				</li>
+			<?php endif; ?>
+	<?php endforeach; ?>
+</ul>
diff --git a/modules/mod_menu/tmpl/default_heading.php b/modules/mod_menu/tmpl/default_heading.php
index 5612c40bfd54f..805436c336ce1 100644
--- a/modules/mod_menu/tmpl/default_heading.php
+++ b/modules/mod_menu/tmpl/default_heading.php
@@ -33,4 +33,6 @@
 }
 
 ?>
-<span class="nav-header <?php echo $anchor_css; ?>"<?php echo $title; ?>><?php echo $linktype; ?></span>
+<span class="nav-header <?php echo $anchor_css; ?>"<?php echo $title; ?>>
+	<?php echo $linktype; ?>
+</span>
diff --git a/modules/mod_menu/tmpl/default_separator.php b/modules/mod_menu/tmpl/default_separator.php
index eca36cce382db..997e4849f121f 100644
--- a/modules/mod_menu/tmpl/default_separator.php
+++ b/modules/mod_menu/tmpl/default_separator.php
@@ -33,4 +33,6 @@
 }
 
 ?>
-<span class="separator <?php echo $anchor_css; ?>"<?php echo $title; ?>><?php echo $linktype; ?></span>
+<span class="separator <?php echo $anchor_css; ?>"<?php echo $title; ?>>
+	<?php echo $linktype; ?>
+</span>
diff --git a/modules/mod_random_image/tmpl/default.php b/modules/mod_random_image/tmpl/default.php
index d1caddec2f1b1..f38347f9491b6 100644
--- a/modules/mod_random_image/tmpl/default.php
+++ b/modules/mod_random_image/tmpl/default.php
@@ -8,13 +8,16 @@
  */
 
 defined('_JEXEC') or die;
+
+$image = JHtml::_('image', $image->folder . '/' . $image->name, $image->name, array('width' => $image->width, 'height' => $image->height)); 
+
 ?>
 <div class="random-image<?php echo $moduleclass_sfx; ?>">
-<?php if ($link) : ?>
-<a href="<?php echo $link; ?>">
-<?php endif; ?>
-	<?php echo JHtml::_('image', $image->folder . '/' . $image->name, $image->name, array('width' => $image->width, 'height' => $image->height)); ?>
-<?php if ($link) : ?>
-</a>
-<?php endif; ?>
+	<?php if ($link) : ?>
+		<a href="<?php echo $link; ?>">
+			<?php echo $image; ?>
+		</a>
+	<?php else : ?>
+		<?php echo $image; ?>
+	<?php endif; ?>
 </div>
diff --git a/modules/mod_related_items/tmpl/default.php b/modules/mod_related_items/tmpl/default.php
index fdbc7ac573538..868d804d2afaf 100644
--- a/modules/mod_related_items/tmpl/default.php
+++ b/modules/mod_related_items/tmpl/default.php
@@ -8,13 +8,17 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <ul class="relateditems<?php echo $moduleclass_sfx; ?>">
-<?php foreach ($list as $item) : ?>
-<li>
-	<a href="<?php echo $item->route; ?>">
-		<?php if ($showDate) echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')) . ' - '; ?>
-		<?php echo $item->title; ?></a>
-</li>
-<?php endforeach; ?>
+	<?php foreach ($list as $item) : ?>
+		<li>
+			<a href="<?php echo $item->route; ?>">
+				<?php if ($showDate) : ?>
+					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')) . ' - '; ?>
+				<?php endif; ?>
+				<?php echo $item->title; ?>
+			</a>
+		</li>
+	<?php endforeach; ?>
 </ul>