diff --git a/components/com_config/view/config/tmpl/default.php b/components/com_config/view/config/tmpl/default.php
index 76f600bd0214f..779ea7cc630df 100644
--- a/components/com_config/view/config/tmpl/default.php
+++ b/components/com_config/view/config/tmpl/default.php
@@ -22,28 +22,26 @@
 		}
 	}
 ");
-?>
 
+?>
 <form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
-
 	<div class="row-fluid">
 		<!-- Begin Content -->
-
 		<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
 			<div class="btn-group">
 				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('config.save.config.apply')">
-					<span class="icon-ok"></span> <?php echo JText::_('JSAVE') ?>
+					<span class="icon-ok"></span>
+					<?php echo JText::_('JSAVE'); ?>
 				</button>
 			</div>
 			<div class="btn-group">
 				<button type="button" class="btn" onclick="Joomla.submitbutton('config.cancel')">
-					<span class="icon-cancel"></span> <?php echo JText::_('JCANCEL') ?>
+					<span class="icon-cancel"></span>
+					<?php echo JText::_('JCANCEL'); ?>
 				</button>
 			</div>
 		</div>
-
 		<hr class="hr-condensed" />
-
 		<div id="page-site" class="tab-pane active">
 			<div class="row-fluid">
 				<?php echo $this->loadTemplate('site'); ?>
@@ -51,11 +49,8 @@
 				<?php echo $this->loadTemplate('seo'); ?>
 			</div>
 		</div>
-
 		<input type="hidden" name="task" value="" />
 		<?php echo JHtml::_('form.token'); ?>
-
 		<!-- End Content -->
 	</div>
-
 </form>
diff --git a/components/com_config/view/config/tmpl/default_metadata.php b/components/com_config/view/config/tmpl/default_metadata.php
index 1441e9974d319..3141bc4f525ff 100644
--- a/components/com_config/view/config/tmpl/default_metadata.php
+++ b/components/com_config/view/config/tmpl/default_metadata.php
@@ -8,17 +8,14 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <fieldset class="form-horizontal">
 	<legend><?php echo JText::_('COM_CONFIG_METADATA_SETTINGS'); ?></legend>
-	<?php
-	foreach ($this->form->getFieldset('metadata') as $field) :
-	?>
+	<?php foreach ($this->form->getFieldset('metadata') as $field) : ?>
 		<div class="control-group">
 			<div class="control-label"><?php echo $field->label; ?></div>
 			<div class="controls"><?php echo $field->input; ?></div>
 		</div>
-	<?php
-	endforeach;
-	?>
+	<?php endforeach; ?>
 </fieldset>
diff --git a/components/com_config/view/config/tmpl/default_seo.php b/components/com_config/view/config/tmpl/default_seo.php
index 6327c0284d5e9..005baa2ca4183 100644
--- a/components/com_config/view/config/tmpl/default_seo.php
+++ b/components/com_config/view/config/tmpl/default_seo.php
@@ -8,17 +8,14 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <fieldset class="form-horizontal">
 	<legend><?php echo JText::_('COM_CONFIG_SEO_SETTINGS'); ?></legend>
-	<?php
-	foreach ($this->form->getFieldset('seo') as $field) :
-	?>
+	<?php foreach ($this->form->getFieldset('seo') as $field) : ?>
 		<div class="control-group">
 			<div class="control-label"><?php echo $field->label; ?></div>
 			<div class="controls"><?php echo $field->input; ?></div>
 		</div>
-	<?php
-	endforeach;
-	?>
+	<?php endforeach; ?>
 </fieldset>
diff --git a/components/com_config/view/config/tmpl/default_site.php b/components/com_config/view/config/tmpl/default_site.php
index 6dfad93559df6..185f4cbfee772 100644
--- a/components/com_config/view/config/tmpl/default_site.php
+++ b/components/com_config/view/config/tmpl/default_site.php
@@ -8,17 +8,14 @@
  */
 
 defined('_JEXEC') or die;
+
 ?>
 <fieldset class="form-horizontal">
 	<legend><?php echo JText::_('COM_CONFIG_SITE_SETTINGS'); ?></legend>
-	<?php
-	foreach ($this->form->getFieldset('site') as $field) :
-	?>
+	<?php foreach ($this->form->getFieldset('site') as $field) : ?>
 		<div class="control-group">
 			<div class="control-label"><?php echo $field->label; ?></div>
 			<div class="controls"><?php echo $field->input; ?></div>
 		</div>
-	<?php
-	endforeach;
-	?>
+	<?php endforeach; ?>
 </fieldset>
diff --git a/components/com_config/view/modules/tmpl/default.php b/components/com_config/view/modules/tmpl/default.php
index f43a442921380..91e5b2addf996 100644
--- a/components/com_config/view/modules/tmpl/default.php
+++ b/components/com_config/view/modules/tmpl/default.php
@@ -32,55 +32,42 @@
 		}
 	}
 ");
-?>
-
-<form
-	action="<?php echo JRoute::_('index.php?option=com_config'); ?>"
-	method="post" name="adminForm" id="modules-form"
-	class="form-validate">
 
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="modules-form" class="form-validate">
 	<div class="row-fluid">
-
 		<!-- Begin Content -->
 		<div class="span12">
-
 			<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
 				<div class="btn-group">
-					<button type="button" class="btn btn-primary"
-						onclick="Joomla.submitbutton('config.save.modules.apply')">
+					<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('config.save.modules.apply')">
 						<span class="icon-apply"></span>
-						<?php echo JText::_('JAPPLY') ?>
+						<?php echo JText::_('JAPPLY'); ?>
 					</button>
 				</div>
 				<div class="btn-group">
-					<button type="button" class="btn"
-						onclick="Joomla.submitbutton('config.save.modules.save')">
+					<button type="button" class="btn" onclick="Joomla.submitbutton('config.save.modules.save')">
 						<span class="icon-save"></span>
-						<?php echo JText::_('JSAVE') ?>
+						<?php echo JText::_('JSAVE'); ?>
 					</button>
 				</div>
 				<div class="btn-group">
-					<button type="button" class="btn"
-						onclick="Joomla.submitbutton('config.cancel.modules')">
+					<button type="button" class="btn" onclick="Joomla.submitbutton('config.cancel.modules')">
 						<span class="icon-cancel"></span>
-						<?php echo JText::_('JCANCEL') ?>
+						<?php echo JText::_('JCANCEL'); ?>
 					</button>
 				</div>
 			</div>
-
 			<hr class="hr-condensed" />
-
 			<legend><?php echo JText::_('COM_CONFIG_MODULES_SETTINGS_TITLE'); ?></legend>
-
 			<div>
-				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_NAME') ?>
-				<span class="label label-default"><?php echo $this->item['title'] ?></span>
+				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_NAME'); ?>
+				<span class="label label-default"><?php echo $this->item['title']; ?></span>
 				&nbsp;&nbsp;
-				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_TYPE') ?>
-				<span class="label label-default"><?php echo $this->item['module'] ?></span>
+				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_TYPE'); ?>
+				<span class="label label-default"><?php echo $this->item['module']; ?></span>
 			</div>
 			<hr />
-
 			<div class="row-fluid">
 				<div class="span12">
 					<fieldset class="form-horizontal">
@@ -108,21 +95,17 @@ class="form-validate">
 								<?php echo $this->loadTemplate('positions'); ?>
 							</div>
 						</div>
-
 						<hr />
-
-						<?php
-						if (JFactory::getUser()->authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?>
-						<div class="control-group">
-							<div class="control-label">
-								<?php echo $this->form->getLabel('published'); ?>
+						<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('published'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('published'); ?>
+								</div>
 							</div>
-							<div class="controls">
-								<?php echo $this->form->getInput('published'); ?>
-							</div>
-						</div>
-						<?php endif ?>
-
+						<?php endif; ?>
 						<div class="control-group">
 							<div class="control-label">
 								<?php echo $this->form->getLabel('publish_up'); ?>
@@ -139,7 +122,6 @@ class="form-validate">
 								<?php echo $this->form->getInput('publish_down'); ?>
 							</div>
 						</div>
-
 						<div class="control-group">
 							<div class="control-label">
 								<?php echo $this->form->getLabel('access'); ?>
@@ -156,7 +138,6 @@ class="form-validate">
 								<?php echo $this->form->getInput('ordering'); ?>
 							</div>
 						</div>
-
 						<div class="control-group">
 							<div class="control-label">
 								<?php echo $this->form->getLabel('language'); ?>
@@ -173,13 +154,10 @@ class="form-validate">
 								<?php echo $this->form->getInput('note'); ?>
 							</div>
 						</div>
-
 						<hr />
-
 						<div id="options">
 							<?php echo $this->loadTemplate('options'); ?>
 						</div>
-
 						<?php if ($hasContent) : ?>
 							<div class="tab-pane" id="custom">
 								<?php echo $this->form->getInput('content'); ?>
@@ -187,16 +165,12 @@ class="form-validate">
 						<?php endif; ?>
 					</fieldset>
 				</div>
-
 				<input type="hidden" name="id" value="<?php echo $this->item['id']; ?>" />
 				<input type="hidden" name="return" value="<?php echo JFactory::getApplication()->input->get('return', null, 'base64'); ?>" />
 				<input type="hidden" name="task" value="" />
 				<?php echo JHtml::_('form.token'); ?>
-
 			</div>
-
 		</div>
 		<!-- End Content -->
 	</div>
-
 </form>
diff --git a/components/com_config/view/modules/tmpl/default_options.php b/components/com_config/view/modules/tmpl/default_options.php
index cf6690acc2885..cb9b9fdc44909 100644
--- a/components/com_config/view/modules/tmpl/default_options.php
+++ b/components/com_config/view/modules/tmpl/default_options.php
@@ -9,47 +9,37 @@
 
 defined('_JEXEC') or die;
 
-$fieldSets = $this->form->getFieldsets('params');
-
-echo JHtml::_('bootstrap.startAccordion', 'collapseTypes');
-$i = 0;
-
-foreach ($fieldSets as $name => $fieldSet) :
-
-$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MODULES_' . $name . '_FIELDSET_LABEL';
-$class = isset($fieldSet->class) && !empty($fieldSet->class) ? $fieldSet->class : '';
-
-
-if (isset($fieldSet->description) && trim($fieldSet->description)) :
-echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
-endif;
 ?>
-<?php echo JHtml::_('bootstrap.addSlide', 'collapseTypes', JText::_($label), 'collapse' . ($i++)); ?>
-
-<ul class="nav nav-tabs nav-stacked">
-<?php foreach ($this->form->getFieldset($name) as $field) : ?>
-
-	<li>
-		<div class="control-group">
-			<div class="control-label">
-				<?php echo $field->label; ?>
-			</div>
-			<div class="controls">
-				<?php
-				// If multi-language site, make menu-type selection read-only
-				if (JLanguageMultilang::isEnabled() && $this->item['module'] === 'mod_menu' && $field->getAttribute('name') === 'menutype')
-				{
-					$field->__set('readonly', true);
-				}
-				echo $field->input;
-				?>
-			</div>
-		</div>
-	</li>
-
-<?php endforeach; ?>
-</ul>
-
-<?php echo JHtml::_('bootstrap.endSlide'); ?>
-<?php endforeach; ?>
+<?php $fieldSets = $this->form->getFieldsets('params'); ?>
+<?php echo JHtml::_('bootstrap.startAccordion', 'collapseTypes'); ?>
+	<?php $i = 0; ?>
+	<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+		<?php $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MODULES_' . $name . '_FIELDSET_LABEL'; ?>
+		<?php $class = isset($fieldSet->class) && !empty($fieldSet->class) ? $fieldSet->class : ''; ?>
+		<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+			<p class="tip">
+				<?php echo $this->escape(JText::_($fieldSet->description)); ?>
+			</p>
+		<?php endif; ?>
+		<?php echo JHtml::_('bootstrap.addSlide', 'collapseTypes', JText::_($label), 'collapse' . ($i++)); ?>
+			<ul class="nav nav-tabs nav-stacked">
+				<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+					<li>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $field->label; ?>
+							</div>
+							<div class="controls">
+								<?php // If multi-language site, make menu-type selection read-only ?>
+								<?php if (JLanguageMultilang::isEnabled() && $this->item['module'] === 'mod_menu' && $field->getAttribute('name') === 'menutype') : ?>
+									<?php $field->__set('readonly', true); ?>
+								<?php endif; ?>
+								<?php echo $field->input; ?>
+							</div>
+						</div>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+		<?php echo JHtml::_('bootstrap.endSlide'); ?>
+	<?php endforeach; ?>
 <?php echo JHtml::_('bootstrap.endAccordion'); ?>
diff --git a/components/com_config/view/modules/tmpl/default_positions.php b/components/com_config/view/modules/tmpl/default_positions.php
index c64981dbca822..f780a94920746 100644
--- a/components/com_config/view/modules/tmpl/default_positions.php
+++ b/components/com_config/view/modules/tmpl/default_positions.php
@@ -8,6 +8,7 @@
  */
 
 defined('_JEXEC') or die;
+
 $positions = $this->model->getPositions();
 
 // Add custom position to options
diff --git a/components/com_config/view/templates/tmpl/default.php b/components/com_config/view/templates/tmpl/default.php
index 4ac6a5f843652..24dfd47d5fdaa 100644
--- a/components/com_config/view/templates/tmpl/default.php
+++ b/components/com_config/view/templates/tmpl/default.php
@@ -22,39 +22,34 @@
 		}
 	}
 ");
-?>
 
+?>
 <form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
-
 	<div class="row-fluid">
 		<!-- Begin Content -->
-
 		<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
 			<div class="btn-group">
 				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('config.save.templates.apply')">
-					<span class="icon-ok"></span> <?php echo JText::_('JSAVE') ?>
+					<span class="icon-ok"></span>
+					<?php echo JText::_('JSAVE'); ?>
 				</button>
 			</div>
 			<div class="btn-group">
 				<button type="button" class="btn" onclick="Joomla.submitbutton('config.cancel')">
-					<span class="icon-cancel"></span> <?php echo JText::_('JCANCEL') ?>
+					<span class="icon-cancel"></span>
+					<?php echo JText::_('JCANCEL'); ?>
 				</button>
 			</div>
 		</div>
-
 		<hr class="hr-condensed" />
-
 		<div id="page-site" class="tab-pane active">
 			<div class="row-fluid">
-				<?php // Get the menu parameters that are automatically set but may be modified.
-				echo $this->loadTemplate('options'); ?>
+				<?php // Get the menu parameters that are automatically set but may be modified. ?>
+				<?php echo $this->loadTemplate('options'); ?>
 			</div>
 		</div>
-
 		<input type="hidden" name="task" value="" />
 		<?php echo JHtml::_('form.token'); ?>
-
 		<!-- End Content -->
 	</div>
-
 </form>
diff --git a/components/com_config/view/templates/tmpl/default_options.php b/components/com_config/view/templates/tmpl/default_options.php
index de87a9e1f3660..b2125ecf319b0 100644
--- a/components/com_config/view/templates/tmpl/default_options.php
+++ b/components/com_config/view/templates/tmpl/default_options.php
@@ -12,36 +12,26 @@
 // Load chosen.css
 JHtml::_('formbehavior.chosen', 'select');
 
-?>
-<?php
+$fieldSets = $this->form->getFieldsets('params');
 
-	$fieldSets = $this->form->getFieldsets('params');
 ?>
-
 <legend><?php echo JText::_('COM_CONFIG_TEMPLATE_SETTINGS'); ?></legend>
-
-<?php
-
-	// Search for com_config field set
-	if (!empty($fieldSets['com_config'])) : ?>
-
+<?php // Search for com_config field set ?>
+<?php if (!empty($fieldSets['com_config'])) : ?>
 	<fieldset class="form-horizontal">
 		<?php echo $this->form->renderFieldset('com_config'); ?>
 	</fieldset>
-
-<?php else :
-
-	// Fall-back to display all in params
-	foreach ($fieldSets as $name => $fieldSet) :
-	$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CONFIG_' . $name . '_FIELDSET_LABEL';
-
-	if (isset($fieldSet->description) && trim($fieldSet->description)) :
-		echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
-	endif;
-	?>
-
-<fieldset class="form-horizontal">
-	<?php echo $this->form->renderFieldset($name); ?>
-</fieldset>
-	<?php endforeach;
-	endif;
+<?php else : ?>
+	<?php // Fall-back to display all in params ?>
+	<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+		<?php $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CONFIG_' . $name . '_FIELDSET_LABEL'; ?>
+		<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+			<p class="tip">
+				<?php echo $this->escape(JText::_($fieldSet->description)); ?>
+			</p>
+		<?php endif; ?>
+		<fieldset class="form-horizontal">
+			<?php echo $this->form->renderFieldset($name); ?>
+		</fieldset>
+	<?php endforeach; ?>
+<?php endif; ?>