diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
index ec62ee2a0335..4ad09aee3008 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
@@ -32,8 +32,8 @@
     <h4><?php echo Mage::helper('catalog')->__('Bundle Items') ?></h4>
     <div class="product-options">
         <dl>
-            <?php foreach ($options as $option) : ?>
-                <?php if ($option->getSelections()) : ?>
+            <?php foreach ($options as $option): ?>
+                <?php if ($option->getSelections()): ?>
                     <?php echo $this->getOptionHtml($option); ?>
                 <?php endif ?>
             <?php endforeach ?>
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
index a032b2f5a9a8..d4e638b5ca8b 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
@@ -31,7 +31,7 @@ var bundleTemplateBox = '<table class="border" cellpadding="0" cellspacing="0">'
     '    <thead>' +
     '        <tr class="headings">' +
     '            <th><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Name')) ?></th>' +
-    <?php if ($this->getCanReadPrice() !== false) : ?>
+    <?php if ($this->getCanReadPrice() !== false): ?>
     '            <th class="type-price price-type-box"><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
     '            <th class="type-type price-type-box"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Price Type')) ?></th>' +
     <?php endif ?>
@@ -56,8 +56,8 @@ var bundleTemplateRow ='<td>' +
                 '        <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> {{sku}}' +
                 '    </div>' +
                 '</td>' +
-                <?php if ($this->getCanReadPrice() !== false) : ?>
-                '<td class="price-type-box"><input id="<?php echo $this->getFieldId() ?>_{{index}}_price_value" class="input-text required-entry validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][selection_price_value]" value="{{selection_price_value}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif ?>></td>' +
+                <?php if ($this->getCanReadPrice() !== false): ?>
+                '<td class="price-type-box"><input id="<?php echo $this->getFieldId() ?>_{{index}}_price_value" class="input-text required-entry validate-zero-or-greater" type="text" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][selection_price_value]" value="{{selection_price_value}}"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled"<?php endif ?>></td>' +
                 '<td class="price-type-box"><?php echo $this->getPriceTypeSelectHtml() ?><div><?php echo $this->getCheckboxScopeHtml() ?></div></td>' +
                 <?php else: ?>
                     '<input type="hidden" id="<?php echo $this->getFieldId(); ?>_{{index}}_price_value" name="<?php echo $this->getFieldName(); ?>[{{parentIndex}}][{{index}}][selection_price_value]" value="0" />' +
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
index a891b57306a5..aa280997eaea 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
@@ -222,10 +222,10 @@
                 &nbsp;
             <?php endif ?>
         </td>
-        <?php if ($this->canParentReturnToStock($_item)) : ?>
+        <?php if ($this->canParentReturnToStock($_item)): ?>
         <td class="a-center">
             <?php if ($this->canShowPriceInfo($_item)): ?>
-                <?php if ($this->canReturnItemToStock($_item)) : ?>
+                <?php if ($this->canReturnItemToStock($_item)): ?>
                     <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()): ?> checked="checked"<?php endif ?> />
                 <?php endif ?>
             <?php else: ?>
@@ -235,7 +235,7 @@
         <?php endif ?>
         <td class="a-center">
             <?php if ($this->canShowPriceInfo($_item)): ?>
-                <?php if ($this->canEditQty()) : ?>
+                <?php if ($this->canEditQty()): ?>
                     <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>" />
                 <?php else: ?>
                     <?php echo $_item->getQty()*1 ?>
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
index 576b314b8ada..1f916e73e8e4 100644
--- a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
@@ -223,7 +223,7 @@
         </td>
         <td class="a-center">
             <?php if ($this->canShowPriceInfo($_item)): ?>
-                <?php if ($this->canEditQty()) : ?>
+                <?php if ($this->canEditQty()): ?>
                     <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
                 <?php else: ?>
                     <?php echo $_item->getQty()*1 ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
index ad85ce12db1a..3dc4763738e9 100644
--- a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
@@ -45,7 +45,7 @@
     <td class="label"><?php echo trim($this->getElementLabelHtml()) ?></td>
     <td class="value">
         <?php echo trim($this->getElementHtml()) ?>
-        <?php if ($_element->getNote()) : ?>
+        <?php if ($_element->getNote()): ?>
             <p class="note"><?php echo $this->__($_element->getNote()); ?></p>
         <?php endif ?>
     </td>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml
index 4c9054c7e328..4eb59e0f566a 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml
@@ -74,7 +74,7 @@
                     <?php endif ?>
                     <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
                     <td class="a-center">
-                    <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
+                    <?php if ($_item->isSaleable() || $_skipSaleableCheck): ?>
                         <input type="text" name="super_group[<?php echo $_item->getId() ?>]" id="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('catalog')->__('Qty')) ?>" class="input-text qty" />
                         <input type="hidden" value="1" price="<?php echo $this->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php echo $_item->getId() ?>]" />
                     <?php else: ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
index 0e87763d664f..11e7dfc0ef77 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
@@ -28,15 +28,15 @@
 
 OptionTemplateDate = '<table class="border" cellpadding="0" cellspacing="0">'+
         '<tr class="headings">'+
-            <?php if ($this->getCanReadPrice() !== false) : ?>
+            <?php if ($this->getCanReadPrice() !== false): ?>
             '<th class="type-price"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
             '<th class="type-type"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price Type')) ?></th>' +
             <?php endif ?>
             '<th class="last"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('SKU')) ?></th>'+
         '</tr>'+
         '<tr>'+
-            <?php if ($this->getCanReadPrice() !== false) : ?>
-            '<td><input type="text" class="input-text validate-number product-option-price" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif ?>></td>' +
+            <?php if ($this->getCanReadPrice() !== false): ?>
+            '<td><input type="text" class="input-text validate-number product-option-price" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled"<?php endif ?>></td>' +
             '<td><?php echo $this->getPriceTypeSelectHtml() ?>{{checkboxScopePrice}}</td>' +
             <?php else: ?>
             '<input type="hidden" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]">' +
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
index 87bf7805692e..aa91fa4ecd2b 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
@@ -28,7 +28,7 @@
 
 OptionTemplateFile = '<table class="border" cellpadding="0" cellspacing="0">'+
         '<tr class="headings">'+
-            <?php if ($this->getCanReadPrice() !== false) : ?>
+            <?php if ($this->getCanReadPrice() !== false): ?>
             '<th class="type-price">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Price')); ?> + '</th>' +
             '<th class="type-type">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Price Type')); ?> + '</th>' +
             <?php endif ?>
@@ -37,8 +37,8 @@ OptionTemplateFile = '<table class="border" cellpadding="0" cellspacing="0">'+
             '<th class="last">' + <?php echo $this->helper('core')->jsonEncode(Mage::helper('catalog')->__('Maximum Image Size')); ?> + '</th>' +
         '</tr>' +
         '<tr>' +
-            <?php if ($this->getCanReadPrice() !== false) : ?>
-            '<td><input class="input-text validate-zero-or-greater" type="text" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif ?>></td>' +
+            <?php if ($this->getCanReadPrice() !== false): ?>
+            '<td><input class="input-text validate-zero-or-greater" type="text" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled"<?php endif ?>></td>' +
             '<td>' + <?php echo $this->helper('core')->jsonEncode($this->getPriceTypeSelectHtml()) ?> + '</td>' +
             <?php else: ?>
             '<input type="hidden" name="product[options][{{option_id}}][price]">' +
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
index 61e1ca66ed33..42f8e2f30e5e 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
@@ -32,7 +32,7 @@ OptionTemplateSelect = '<table class="border" cellpadding="0" cellspacing="0">'+
         '<thead>'+
         '<tr class="headings">'+
             '<th class="type-title"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Title')) ?> <span class="required">*</span></th>'+
-            <?php if ($this->getCanReadPrice() !== false) : ?>
+            <?php if ($this->getCanReadPrice() !== false): ?>
             '<th class="type-price"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
             '<th class="type-type"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price Type')) ?></th>' +
             <?php endif ?>
@@ -55,8 +55,8 @@ OptionTemplateSelectRow = '<tr id="product_option_{{id}}_select_{{select_id}}">'
             '<input type="hidden" name="product[options][{{id}}][values][{{select_id}}][option_type_id]" value="{{option_type_id}}">'+
             '<input type="hidden" id="product_option_{{id}}_select_{{select_id}}_is_delete" name="product[options][{{id}}][values][{{select_id}}][is_delete]" value="">'+
             '<input type="text" class="required-entry input-text select-type-title" id="product_option_{{id}}_select_{{select_id}}_title" name="product[options][{{id}}][values][{{select_id}}][title]" value="{{title}}">{{checkboxScopeTitle}}</td>'+
-            <?php if ($this->getCanReadPrice() !== false) : ?>
-            '<td><input type="text" class="input-text validate-number product-option-price" id="product_option_{{id}}_select_{{select_id}}_price" name="product[options][{{id}}][values][{{select_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif ?>></td>' +
+            <?php if ($this->getCanReadPrice() !== false): ?>
+            '<td><input type="text" class="input-text validate-number product-option-price" id="product_option_{{id}}_select_{{select_id}}_price" name="product[options][{{id}}][values][{{select_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled"<?php endif ?>></td>' +
             '<td><?php echo $this->getPriceTypeSelectHtml() ?>{{checkboxScopePrice}}</td>' +
             <?php else: ?>
             '<input type="hidden" id="product_option_{{id}}_select_{{select_id}}_price" name="product[options][{{id}}][values][{{select_id}}][price]">' +
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
index 28ad5b239fcb..67138388ba06 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
@@ -28,7 +28,7 @@
 //<![CDATA[
 OptionTemplateText = '<table class="border" cellpadding="0" cellspacing="0">'+
         '<tr class="headings">'+
-            <?php if ($this->getCanReadPrice() !== false) : ?>
+            <?php if ($this->getCanReadPrice() !== false): ?>
             '<th class="type-price"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
             '<th class="type-type"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price Type')) ?></th>' +
             <?php endif ?>
@@ -36,8 +36,8 @@ OptionTemplateText = '<table class="border" cellpadding="0" cellspacing="0">'+
             '<th class="type-last last"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Max Characters')) ?> </th>'+
         '</tr>'+
         '<tr>'+
-            <?php if ($this->getCanReadPrice() !== false) : ?>
-            '<td><input type="text" class="input-text validate-number product-option-price" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif ?>></td>' +
+            <?php if ($this->getCanReadPrice() !== false): ?>
+            '<td><input type="text" class="input-text validate-number product-option-price" id="product_option_{{option_id}}_price" name="product[options][{{option_id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled"<?php endif ?>></td>' +
             '<td><?php echo $this->getPriceTypeSelectHtml() ?>{{checkboxScopePrice}}</td>' +
             <?php else: ?>
             '<input type="hidden" name="product[options][{{option_id}}][price]">' +
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml
index fcb730510d78..88e11d145138 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml
@@ -38,7 +38,7 @@ $_showWebsite= $this->isMultiWebsites();
     <td class="label"><?php echo $this->getElement()->getLabel(); ?></td>
     <td colspan="10" class="grid tier">
     <table cellspacing="0" class="data border" id="group_prices_table">
-        <?php if ($_showWebsite) : ?>
+        <?php if ($_showWebsite): ?>
         <col width="135" />
         <?php endif ?>
         <col width="120" />
@@ -66,8 +66,8 @@ $_showWebsite= $this->isMultiWebsites();
 var groupPriceRowTemplate = '<tr>'
     + '<td<?php if (!$_showWebsite): ?> style="display:none"<?php endif ?>>'
     + '<select class="<?php echo $_htmlClass; ?> required-entry" name="<?php echo $_htmlName; ?>[{{index}}][website_id]" id="group_price_row_{{index}}_website">'
-    <?php foreach ($this->getWebsites() as $_websiteId => $_info) : ?>
-    + '<option value="<?php echo $_websiteId; ?>"><?php echo $this->jsQuoteEscape($this->escapeHtml($_info['name'])); ?><?php if (!empty($_info['currency'])) : ?> [<?php echo $this->escapeHtml($_info['currency']); ?>]<?php endif ?></option>'
+    <?php foreach ($this->getWebsites() as $_websiteId => $_info): ?>
+    + '<option value="<?php echo $_websiteId; ?>"><?php echo $this->jsQuoteEscape($this->escapeHtml($_info['name'])); ?><?php if (!empty($_info['currency'])): ?> [<?php echo $this->escapeHtml($_info['currency']); ?>]<?php endif ?></option>'
     <?php endforeach ?>
     + '</select></td>'
     + '<td><select class="<?php echo $_htmlClass; ?> custgroup required-entry" name="<?php echo $_htmlName; ?>[{{index}}][cust_group]" id="group_price_row_{{index}}_cust_group">'
@@ -76,7 +76,7 @@ var groupPriceRowTemplate = '<tr>'
     <?php endforeach ?>
     + '</select></td>'
     + '<td><input class="<?php echo $_htmlClass; ?> required-entry <?php echo $_priceValueValidation; ?>" type="text" name="<?php echo $_htmlName; ?>[{{index}}][price]" value="{{price}}" id="group_price_row_{{index}}_price" />'
-    + '<input type="hidden" name="<?php echo $_htmlName; ?>[{{index}}][is_percent]" value="<?php if ($this->getIsPercent()) : ?>1<?php else: ?>0<?php endif ?>" id="group_price_row_{{index}}_is_percent" /></td>'
+    + '<input type="hidden" name="<?php echo $_htmlName; ?>[{{index}}][is_percent]" value="<?php if ($this->getIsPercent()): ?>1<?php else: ?>0<?php endif ?>" id="group_price_row_{{index}}_is_percent" /></td>'
     + '<td class="last"><input type="hidden" name="<?php echo $_htmlName; ?>[{{index}}][delete]" class="delete" value="" id="group_price_row_{{index}}_delete" />'
     + '<button title="<?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Delete Group Price')); ?>" type="button" class="scalable delete icon-btn delete-product-option" id="group_price_row_{{index}}_delete_button" onclick="return groupPriceControl.deleteItem(event);">'
     + '<span><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Delete')); ?></span></button></td>'
@@ -158,10 +158,10 @@ var groupPriceControl = {
         return false;
     }
 };
-<?php foreach ($this->getValues() as $_item) : ?>
+<?php foreach ($this->getValues() as $_item): ?>
 groupPriceControl.addItem('<?php echo $_item['website_id']; ?>', '<?php echo $_item['cust_group']; ?>', '<?php echo sprintf('%.2f', $_item['price']); ?>', <?php echo (int)!empty($_item['readonly']); ?>);
 <?php endforeach ?>
-<?php if ($_readonly) : ?>
+<?php if ($_readonly): ?>
 $('<?php echo $_htmlId; ?>_container').up('table').select('button')
     .each(groupPriceControl.disableElement);
 <?php endif ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml
index c0b9b64a78a5..aabdd49d801a 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml
@@ -83,7 +83,7 @@
     <div class="attribute-value-label-container left">
     <?php echo Mage::helper('catalog')->__('Option:') ?> <strong>'{{label}}'</strong>
 </div>
-<?php if ($this->getCanReadPrice() !== false) : ?>
+<?php if ($this->getCanReadPrice() !== false): ?>
 <div class="attribute-values-container-main">
     <div class="attribute-values-container left">
     <?php echo Mage::helper('catalog')->__('Price:') ?>
@@ -108,7 +108,7 @@
 <div class="attribute-values-container left">
     <input type="hidden" class="attribute-price-type" id="__id___price_type" value="0" />
 </div>
-<?php if ($this->getShowUseDefaultPrice()) : ?>
+<?php if ($this->getShowUseDefaultPrice()): ?>
 <div class="attribute-values-container no-display">
     <input id="__id___default" type="checkbox" <?php if ($this->isReadonly() || $this->getCanEditPrice() === false): ?> disabled="disabled" <?php endif ?> class="attribute-use-default-value">
 </div>
@@ -117,13 +117,13 @@
 </div>
 </div>
 <div class="template no-display" id="<?php echo $this->getHtmlId() ?>_simple_pricing">
-    <?php if ($this->getCanReadPrice() !== false) : ?>
+    <?php if ($this->getCanReadPrice() !== false): ?>
         <div class="attribute-values-container left v-middle">
             &nbsp;<?php echo Mage::helper('catalog')->__('Price:') ?>
-            <input type="text" class="input-text attribute-price validate-number"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled" <?php endif ?>/>
+            <input type="text" class="input-text attribute-price validate-number"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled" <?php endif ?>/>
         </div>
         <div class="attribute-values-container left v-middle">
-            &nbsp;<select class="attribute-price-type"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled" <?php endif ?>>
+            &nbsp;<select class="attribute-price-type"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled" <?php endif ?>>
                 <option value="0"><?php echo Mage::helper('catalog')->__('Fixed') ?></option>
                 <option value="1"><?php echo Mage::helper('catalog')->__('Percentage') ?></option>
             </select>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml b/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
index d70281f99a5b..ab8c7f70ab03 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
@@ -108,7 +108,7 @@
             <td class="value scope-label"><?php echo Mage::helper('adminhtml')->__('[GLOBAL]') ?></td>
         </tr>
 
-        <?php if (!$this->isVirtual()) : ?>
+        <?php if (!$this->isVirtual()): ?>
         <tr>
             <td class="label"><label for="inventory_is_decimal_divided"><?php echo Mage::helper('catalog')->__('Can be Divided into Multiple Boxes for Shipping') ?></label></td>
             <td class="value"><select id="inventory_is_decimal_divided" name="<?php echo $this->getFieldSuffix() ?>[stock_data][is_decimal_divided]" class="select" <?php echo $_readonly;?>>
@@ -226,13 +226,13 @@
     }
 
     function applyEnableDecimalDivided() {
-    <?php if (!$this->isVirtual()) : ?>
+    <?php if (!$this->isVirtual()): ?>
         $('inventory_is_decimal_divided').up('tr').hide();
         <?php endif ?>
         $('inventory_qty_increments').removeClassName('validate-digits').removeClassName('validate-number');
         $('inventory_min_sale_qty').removeClassName('validate-digits').removeClassName('validate-number');
         if ($('inventory_is_qty_decimal').value == 1) {
-        <?php if (!$this->isVirtual()) : ?>
+        <?php if (!$this->isVirtual()): ?>
             $('inventory_is_decimal_divided').up('tr').show();
             <?php endif ?>
             $('inventory_qty_increments').addClassName('validate-number');
diff --git a/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml b/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml
index 67253e2b0ae0..04a63948ca6e 100644
--- a/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml
+++ b/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml
@@ -36,7 +36,7 @@
 <div class="bundle-product-options">
     <strong><?php echo $this->escapeHtml($product->getName())?></strong>
     <dl>
-        <?php foreach ($options as $option) : ?>
+        <?php foreach ($options as $option): ?>
             <dt><?php echo $this->escapeHtml($option['label']) ?></dt>
             <?php $formatedOptionValue = $this->getFormattedOptionValue($option) ?>
             <dd><?php echo $formatedOptionValue['value'] ?></dd>
diff --git a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml b/app/design/adminhtml/default/default/template/customer/tab/cart.phtml
index fcccb9cfe64e..eff443ffaca6 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/cart.phtml
@@ -35,7 +35,7 @@
 </div>
 <?php endif ?>
 <?php echo $this->getGridParentHtml() ?>
-<?php if ($this->canDisplayContainer()) : ?>
+<?php if ($this->canDisplayContainer()): ?>
 <?php
     $listType = $this->getJsObjectName();
 ?>
diff --git a/app/design/adminhtml/default/default/template/dashboard/index.phtml b/app/design/adminhtml/default/default/template/dashboard/index.phtml
index f5b7df811d00..d07a66f50eaa 100644
--- a/app/design/adminhtml/default/default/template/dashboard/index.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/index.phtml
@@ -25,7 +25,7 @@
  */
 ?>
 
-<?php if (is_array($this->getChild('diagrams')->getTabsIds())) : ?>
+<?php if (is_array($this->getChild('diagrams')->getTabsIds())): ?>
 <script type="text/javascript">
 //<![CDATA[
 function changeDiagramsPeriod(periodObj) {
@@ -116,7 +116,7 @@ function toggleCal(id) {
             <td>
                 <div class="entry-edit" style="border:1px solid #ccc;">
                     <?php echo $this->getChildHtml('diagrams') ?>
-                    <?php if (is_array($this->getChild('diagrams')->getTabsIds())) : ?>
+                    <?php if (is_array($this->getChild('diagrams')->getTabsIds())): ?>
                         <div id="diagram_tab_content"></div>
                     <?php endif ?>
                     <div style="margin:20px;">
diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
index db655fd24bed..f2957ce15f00 100644
--- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
+++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
@@ -80,7 +80,7 @@
     <thead>
         <tr class="headings">
             <th><?php echo Mage::helper('downloadable')->__('Title')?> <span class="required">*</span></th>
-            <?php if ($this->getCanReadPrice() !== false) : ?>
+            <?php if ($this->getCanReadPrice() !== false): ?>
             <th><?php echo Mage::helper('downloadable')->__('Price')?></th>
             <?php endif ?>
             <th><span class="nobr"><?php echo Mage::helper('downloadable')->__('Max. Downloads')?></span></th>
@@ -113,17 +113,17 @@ var linkTemplate = '<tr>'+
         '<input type="text" class="required-entry input-text" name="downloadable[link][{{id}}][title]" value="{{title}}" />'+
         '<?php echo $_product->getStoreId()?'<input type="checkbox" id="downloadable_link_{{id}}_title" name="downloadable[link][{{id}}][use_default_title]" value="1" /><label class="normal" for="downloadable_link_{{id}}_title">Use Default Value</label>':'' ?>'+
     '</td>'+
-    <?php if ($this->getCanReadPrice() !== false) : ?>
+    <?php if ($this->getCanReadPrice() !== false): ?>
     '<td class="input-price">'+
-        '<input type="text" id="downloadable_link_{{id}}_price_value" class="input-text validate-number link-prices<?php if ($this->getCanEditPrice() === false) : ?> disabled<?php endif ?>" name="downloadable[link][{{id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif ?> /> ' +
+        '<input type="text" id="downloadable_link_{{id}}_price_value" class="input-text validate-number link-prices<?php if ($this->getCanEditPrice() === false): ?> disabled<?php endif ?>" name="downloadable[link][{{id}}][price]" value="{{price}}"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled"<?php endif ?> /> ' +
         '<label>[<?php echo Mage::app()->getStore($_product->getStoreId())->getBaseCurrencyCode() ?>]</label>' +
-        <?php if ($_product->getStoreId() && $this->getIsPriceWebsiteScope()) : ?>
-        '<br /><input type="checkbox" id="downloadable_link_{{id}}_price" name="downloadable[link][{{id}}][use_default_price]" value="1"<?php if ($this->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif ?> /> <label for="downloadable_link_{{id}}_price">Use Default Value</label>' +
+        <?php if ($_product->getStoreId() && $this->getIsPriceWebsiteScope()): ?>
+        '<br /><input type="checkbox" id="downloadable_link_{{id}}_price" name="downloadable[link][{{id}}][use_default_price]" value="1"<?php if ($this->getCanEditPrice() === false): ?> disabled="disabled"<?php endif ?> /> <label for="downloadable_link_{{id}}_price">Use Default Value</label>' +
         <?php endif ?>
     '</td>' +
     <?php else: ?>
     '<input type="hidden" id="downloadable_link_{{id}}_price_value" class="link-prices" name="downloadable[link][{{id}}][price]" value="0" />' +
-    <?php if ($_product->getStoreId() && $this->getIsPriceWebsiteScope()) : ?>
+    <?php if ($_product->getStoreId() && $this->getIsPriceWebsiteScope()): ?>
     '<input type="hidden" id="downloadable_link_{{id}}_price" name="downloadable[link][{{id}}][use_default_price]" value="1" />' +
     <?php endif ?>
     <?php endif ?>
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml
index 4c46335de92e..e29e83e5818c 100644
--- a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml
+++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml
@@ -123,16 +123,16 @@
     <?php endif ?>
 </td>
 <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-<?php if ($this->canParentReturnToStock($_item)) : ?>
+<?php if ($this->canParentReturnToStock($_item)): ?>
     <td class="a-center">
-        <?php if ($this->canReturnItemToStock($_item)) : ?>
+        <?php if ($this->canReturnItemToStock($_item)): ?>
             <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
                    value="1"<?php if ($_item->getBackToStock()): ?> checked<?php endif ?>/>
         <?php endif ?>
     </td>
 <?php endif ?>
 <td class="a-center">
-    <?php if ($this->canEditQty()) : ?>
+    <?php if ($this->canEditQty()): ?>
         <input type="text" class="input-text qty-input"
                name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
                value="<?php echo $_item->getQty() * 1 ?>"/>
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml
index f2b660fe7e01..5f85a9021580 100644
--- a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml
+++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml
@@ -124,7 +124,7 @@
 </td>
 <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
 <td class="a-center">
-    <?php if ($this->canEditQty()) : ?>
+    <?php if ($this->canEditQty()): ?>
         <input type="text" class="input-text qty-input"
                name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
                value="<?php echo $_item->getQty() * 1 ?>"/>
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml
index ce90bdbad3c2..f335c718c7a1 100644
--- a/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml
+++ b/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml
@@ -42,7 +42,7 @@ $logo = $this->getSkinUrl('images/logo-large.gif', array('_area' => 'adminhtml',
                 <div id="messages">
                     <?php echo $this->getMessagesBlock()->toHtml() ?>
                 </div>
-                <?php if (!$this->getHasException()) : ?>
+                <?php if (!$this->getHasException()): ?>
                     <h2><?php echo $this->__('<strong>%s</strong> requests access to your account', $this->escapeHtml($this->getConsumer()->getName())); ?></h2>
                     <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
                     <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml
index 5f847d80d89c..c758d3e4a4bd 100644
--- a/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml
+++ b/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml
@@ -40,7 +40,7 @@
             </div>
             <?php echo $this->getMessagesBlock()->toHtml() ?>
 
-            <?php if (!$this->getHasException()) : ?>
+            <?php if (!$this->getHasException()): ?>
                 <h2><?php echo $this->__('<strong>%s</strong> requests access to your account', $this->escapeHtml($this->getConsumer()->getName())); ?></h2>
                 <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
                 <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml
index 57eea66a65fd..b860a33eb7d0 100644
--- a/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml
+++ b/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml
@@ -37,7 +37,7 @@
         </div>
         <div class="form-box">
             <?php echo $this->getMessagesBlock()->toHtml() ?>
-            <?php if (!$this->getHasException()) : ?>
+            <?php if (!$this->getHasException()): ?>
             <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
                 <?php echo $this->getBlockHtml('formkey'); ?>
                 <fieldset class="fieldset">
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
index ef00a0900d04..7b169e35a4d7 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
@@ -35,7 +35,7 @@
     <?php foreach ($_methods as $_method): $_code = $_method->getCode(); $_counter++; ?>
         <dt>
         <?php if ($_methodsCount > 1): ?>
-            <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if ($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif ?> <?php if ($_counter == $_methodsCount) : ?>class="validate-one-required-by-name"<?php endif ?>/>
+            <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if ($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif ?> <?php if ($_counter == $_methodsCount): ?>class="validate-one-required-by-name"<?php endif ?>/>
         <?php else: ?>
             <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" /></span>
         <?php endif ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
index e9f0347aa619..a941837f2364 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
@@ -435,7 +435,7 @@
     <script type="text/javascript">order.itemsOnchangeBind()</script>
 </div>
 
-<?php if ($this->isGiftMessagesAvailable()) : ?>
+<?php if ($this->isGiftMessagesAvailable()): ?>
 <script type="text/javascript">
 //<![CDATA[
     /**
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml
index ebf9828d7965..80a7e390c9a9 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml
@@ -45,7 +45,7 @@
         <?php echo $this->formatPrice($this->getShippingIncludeTax()) ?>
     </td>
 </tr>
-<?php elseif ($this->displayIncludeTax()) : ?>
+<?php elseif ($this->displayIncludeTax()): ?>
 <tr>
     <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
         <?php echo $this->getTotal()->getTitle() ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml
index c78c63dedd48..0d45f611cb72 100644
--- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml
@@ -25,7 +25,7 @@
  */
 ?>
 <?php $_items = $this->getCreditmemo()->getAllItems() ?>
-<?php if (count($_items)) : ?>
+<?php if (count($_items)): ?>
 <div class="grid np">
   <div class="hor-scroll">
     <table cellspacing="0" class="data order-tables">
@@ -33,7 +33,7 @@
         <col width="1" />
         <col width="1" />
         <col width="1" />
-        <?php if ($this->canReturnToStock()) : ?><col width="1" /><?php endif ?>
+        <?php if ($this->canReturnToStock()): ?><col width="1" /><?php endif ?>
         <col width="1" />
         <col width="1" />
         <col width="1" />
@@ -43,7 +43,7 @@
                 <th><?php echo $this->helper('sales')->__('Product') ?></th>
                 <th><?php echo $this->helper('sales')->__('Price') ?></th>
                 <th class="a-center"><?php echo $this->helper('sales')->__('Qty') ?></th>
-                <?php if ($this->canReturnToStock()) : ?>
+                <?php if ($this->canReturnToStock()): ?>
                 <th><span class="nobr"><?php echo $this->helper('sales')->__('Return to Stock') ?></span></th>
                 <?php endif ?>
                 <th><span class="nobr"><?php echo $this->helper('sales')->__('Qty to Refund') ?></span></th>
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml
index efcbb4d90218..a89b3f74395b 100644
--- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml
@@ -132,16 +132,16 @@
     <?php endif ?>
 </td>
 <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-<?php if ($this->canParentReturnToStock($_item)) : ?>
+<?php if ($this->canParentReturnToStock($_item)): ?>
     <td class="a-center">
-        <?php if ($this->canReturnItemToStock($_item)) : ?>
+        <?php if ($this->canReturnItemToStock($_item)): ?>
             <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
                    value="1"<?php if ($_item->getBackToStock()): ?> checked<?php endif ?>/>
         <?php endif ?>
     </td>
 <?php endif ?>
 <td class="a-center">
-    <?php if ($this->canEditQty()) : ?>
+    <?php if ($this->canEditQty()): ?>
         <input type="text" class="input-text qty-input"
                name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
                value="<?php echo $_item->getQty() * 1 ?>"/>
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml
index f2f69e443bf2..a0b956a335fa 100644
--- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml
@@ -125,15 +125,15 @@
         <?php endif ?>
     </td>
     <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-    <?php if ($this->canParentReturnToStock($_item)) : ?>
+    <?php if ($this->canParentReturnToStock($_item)): ?>
         <td class="a-center">
-        <?php if ($this->canReturnItemToStock($_item)) : ?>
+        <?php if ($this->canReturnItemToStock($_item)): ?>
             <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()): ?> checked<?php endif ?>/>
         <?php endif ?>
         </td>
     <?php endif ?>
     <td class="a-center">
-    <?php if ($this->canEditQty()) : ?>
+    <?php if ($this->canEditQty()): ?>
         <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>"/>
     <?php else: ?>
         <?php echo $_item->getQty()*1 ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml
index a3e2dcd95b40..1336b257f741 100644
--- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml
@@ -134,7 +134,7 @@
 </td>
 <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
 <td class="a-center">
-    <?php if ($this->canEditQty()) : ?>
+    <?php if ($this->canEditQty()): ?>
         <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
                value="<?php echo $_item->getQty() * 1 ?>"/>
     <?php else: ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
index 3541851669bd..66365f49805e 100644
--- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
@@ -127,7 +127,7 @@
     </td>
     <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
     <td class="a-center">
-    <?php if ($this->canEditQty()) : ?>
+    <?php if ($this->canEditQty()): ?>
         <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>"/>
     <?php else: ?>
         <?php echo $_item->getQty()*1 ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml
index 1407e8384c0f..9c595e5771d5 100644
--- a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml
@@ -134,7 +134,7 @@
 </td>
 <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
 <td class="a-center">
-    <?php if ($this->canEditQty()) : ?>
+    <?php if ($this->canEditQty()): ?>
         <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
                value="<?php echo $_item->getQty() * 1 ?>"/>
     <?php else: ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
index c4e6080cc835..a98e90a99135 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
@@ -160,7 +160,7 @@
                                 </thead>
 
                                 <tbody id="">
-                                <?php foreach ($package->getItems() as $itemId => $item) : ?>
+                                <?php foreach ($package->getItems() as $itemId => $item): ?>
                                     <?php $item = new Varien_Object($item) ?>
                                     <tr title="#" id="" class="">
                                         <td class="name">
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml
index 3d2f88d80a3b..99bfaea7bdc5 100644
--- a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml
@@ -29,7 +29,7 @@
 
 <?php if ((float) $_source->getDataUsingMethod($this->getSourceField())): ?>
     <tr>
-        <td class="label"><?php if ($this->getStrong()) : ?><strong><?php endif ?><?php echo Mage::helper('sales')->__($this->getLabel()) ?><?php if ($this->getStrong()) : ?></strong><?php endif ?></td>
-        <td <?php echo $this->getHtmlClass() ? ('class="' . $this->getHtmlClass() . '"') : '';?>><?php if ($this->getStrong()) : ?><strong><?php endif ?><?php echo $this->displayPriceAttribute($this->getSourceField()) ?><?php if ($this->getStrong()) : ?></strong><?php endif ?></td>
+        <td class="label"><?php if ($this->getStrong()): ?><strong><?php endif ?><?php echo Mage::helper('sales')->__($this->getLabel()) ?><?php if ($this->getStrong()): ?></strong><?php endif ?></td>
+        <td <?php echo $this->getHtmlClass() ? ('class="' . $this->getHtmlClass() . '"') : '';?>><?php if ($this->getStrong()): ?><strong><?php endif ?><?php echo $this->displayPriceAttribute($this->getSourceField()) ?><?php if ($this->getStrong()): ?></strong><?php endif ?></td>
     </tr>
 <?php endif ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
index 47aced346b11..9acf50cd2738 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml
@@ -116,7 +116,7 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
                 <tr>
                     <td class="label"><label><?php echo Mage::helper('sales')->__('Customer Name') ?></label></td>
                     <td class="value">
-                    <?php if ($_customerUrl=$this->getCustomerViewUrl()) : ?>
+                    <?php if ($_customerUrl=$this->getCustomerViewUrl()): ?>
                         <a href="<?php echo $_customerUrl ?>" target="_blank"><strong><?php echo $this->escapeHtml($_order->getCustomerName()) ?></strong></a>
                     <?php else: ?>
                         <strong><?php echo $this->escapeHtml($_order->getCustomerName()) ?></strong>
@@ -127,7 +127,7 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
                     <td class="label"><label><?php echo Mage::helper('sales')->__('Email') ?></label></td>
                     <td class="value"><a href="mailto:<?php echo $this->escapeHtml($_order->getCustomerEmail()) ?>"><strong><?php echo $this->escapeHtml($_order->getCustomerEmail()) ?></strong></a></td>
                 </tr>
-                <?php if ($_groupName = $this->getCustomerGroupName()) : ?>
+                <?php if ($_groupName = $this->getCustomerGroupName()): ?>
                 <tr>
                     <td class="label"><label><?php echo Mage::helper('sales')->__('Customer Group') ?></label></td>
                     <td class="value"><strong><?php echo $this->escapeHtml($_groupName) ?></strong></td>
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
index fbcaefd5107d..1bc32628b650 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
@@ -56,7 +56,7 @@
                 <h4 class="icon-head head-shipping-method"><?php echo Mage::helper('sales')->__('Shipping &amp; Handling Information') ?></h4>
             </div>
             <fieldset>
-                <?php  if ($_order->getTracksCollection()->count()) : ?>
+                <?php  if ($_order->getTracksCollection()->count()): ?>
                 <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo $this->quoteEscape($this->__('Track Order')) ?>"><?php echo $this->__('Track Order') ?></a>
                 <br/>
                 <?php endif ?>
diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml
index fd918586ad8f..828e5010c44c 100644
--- a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml
+++ b/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml
@@ -74,7 +74,7 @@ function getTransferType()
 <select id="files" name="files">
     <option value="">Select a file</option>
 <?php if ($files = $this->getImportedFiles()) :
-    foreach ($files as $file) : ?>
+    foreach ($files as $file): ?>
         <option value=<?php echo $file ?>><?php echo $file ?></option>
 <?php   endforeach;
     endif; ?>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
index 6fe3bcfafd21..750dc5bf447a 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
@@ -157,7 +157,7 @@ if ($_product->getPriceType() == 1) {
                         <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                     </span>
                 <?php else: ?>
-                    <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                    <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
                         <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                     <?php else: ?>
                         <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
@@ -209,7 +209,7 @@ if ($_product->getPriceType() == 1) {
                             <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
                         </span>
                     <?php else: ?>
-                    <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                    <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
                         <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
                     <?php else: ?>
                         <?php echo $_coreHelper->currency($_maximalPriceTax) ?>
@@ -277,7 +277,7 @@ if ($_product->getPriceType() == 1) {
                         </small>)</span>
                     <?php endif ?>
                     <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                        <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                        <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
                             <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                         <?php else: ?>
                             <?php echo $_coreHelper->currency($_minimalPriceTax + $_weeeTaxAmount) ?>
diff --git a/app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml b/app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml
index ebe50015e4ae..342f0651f44e 100644
--- a/app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml
+++ b/app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml
@@ -161,7 +161,7 @@ if ($_product->getPriceType() == 1) {
                     <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
                     </span>
             <?php else: ?>
-                <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
                     <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                 <?php else: ?>
                     <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
@@ -229,7 +229,7 @@ if ($_product->getPriceType() == 1) {
                     <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
                         </span>
             <?php else: ?>
-                <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
                     <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
                 <?php else: ?>
                     <?php echo $_coreHelper->currency($_maximalPriceTax) ?>
@@ -301,7 +301,7 @@ if ($_product->getPriceType() == 1) {
                     </small>)</span>
             <?php endif ?>
             <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
+                <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
                     <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
                 <?php else: ?>
                     <?php echo $_coreHelper->currency($_minimalPriceTax + $_weeeTaxAmount) ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
index 3ad167a1a2ac..41cb910921a0 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
@@ -374,7 +374,7 @@
         <td>
             <?php if ($_options = $this->getItemOptions()): ?>
                 <dl class="item-options">
-                    <?php foreach ($_options as $_option) : ?>
+                    <?php foreach ($_options as $_option): ?>
                         <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                         <?php if (!$this->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
index 9622215d7c6a..b35dbceea1fe 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
@@ -354,7 +354,7 @@
         <td>
             <?php if ($_options = $this->getItemOptions()): ?>
                 <dl class="item-options">
-                    <?php foreach ($_options as $_option) : ?>
+                    <?php foreach ($_options as $_option): ?>
                         <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                         <?php if (!$this->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
index 4e184e852d8d..bbc76fbbb657 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
@@ -341,7 +341,7 @@
     <td>
         <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
+        <?php foreach ($_options as $_option): ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
index 46edb23ad0b0..b681113fbe96 100644
--- a/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
+++ b/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
@@ -79,7 +79,7 @@
     <td>
         <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
+        <?php foreach ($_options as $_option): ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/compare/list.phtml b/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
index 4c83286702f4..b783a7c4457b 100644
--- a/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
@@ -80,7 +80,7 @@ $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
-                    <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                    <?php if ($this->helper('wishlist')->isAllow()): ?>
                         <ul class="add-to-links">
                             <li>
                                 <a href="#"
@@ -152,7 +152,7 @@ $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
-                    <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                    <?php if ($this->helper('wishlist')->isAllow()): ?>
                         <ul class="add-to-links">
                             <li>
                                 <a href="#"
diff --git a/app/design/frontend/base/default/template/catalog/product/list.phtml b/app/design/frontend/base/default/template/catalog/product/list.phtml
index 8fcccadb41ad..84dfc90c9418 100644
--- a/app/design/frontend/base/default/template/catalog/product/list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list.phtml
@@ -78,7 +78,7 @@
                         <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>" class="link-learn"><?php echo $this->__('Learn More') ?></a>
                     </div>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <?php $_wishlistUrl = $this->helper('wishlist')->getAddUrlWithCustomParams($_product, array(), false); ?>
                             <li>
                                 <a href="#"
@@ -90,7 +90,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
@@ -140,7 +140,7 @@
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <?php $_wishlistUrl = $this->helper('wishlist')->getAddUrlWithCustomParams($_product, array(), false); ?>
                             <li>
                                 <a href="#"
@@ -152,7 +152,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
diff --git a/app/design/frontend/base/default/template/catalog/product/list/related.phtml b/app/design/frontend/base/default/template/catalog/product/list/related.phtml
index 9bfc617dc2e6..476f4f339693 100644
--- a/app/design/frontend/base/default/template/catalog/product/list/related.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list/related.phtml
@@ -44,7 +44,7 @@
                     <div class="product-details">
                         <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
                         <?php echo $this->getPriceHtml($_item, true, '-related') ?>
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <a href="#"
                                class="link-wishlist"
                                onclick="customFormSubmit(
diff --git a/app/design/frontend/base/default/template/catalog/product/new.phtml b/app/design/frontend/base/default/template/catalog/product/new.phtml
index 75cbd01ec5b3..cf0d5462b1d5 100644
--- a/app/design/frontend/base/default/template/catalog/product/new.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/new.phtml
@@ -52,7 +52,7 @@
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_product, false); ?>
                             <li>
                                 <a href="#"
@@ -64,7 +64,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
diff --git a/app/design/frontend/base/default/template/catalog/product/view/addto.phtml b/app/design/frontend/base/default/template/catalog/product/view/addto.phtml
index 33611192a0d5..45ab12eb9af0 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/addto.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/addto.phtml
@@ -28,7 +28,7 @@
 <?php $_product = $this->getProduct(); ?>
 
 <ul class="add-to-links">
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <li>
         <a href="#"
            onclick="customFormSubmit(
@@ -43,7 +43,7 @@
 <?php
     $_compareUrl = $this->helper('catalog/product_compare')->getAddUrlCustom($_product, false);
 ?>
-<?php if ($_compareUrl) : ?>
+<?php if ($_compareUrl): ?>
     <li>
         <span class="separator">|</span>
         <a href="#"
diff --git a/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml b/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml
index c844f9985abb..de5b29c59d27 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml
@@ -74,7 +74,7 @@
             <?php endif ?>
             <?php if ($_product->isSaleable()): ?>
             <td class="a-center">
-            <?php if ($_item->isSaleable()) : ?>
+            <?php if ($_item->isSaleable()): ?>
                 <input type="text" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
             <?php else: ?>
                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
index 47df42319e5d..049585d8e21d 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
@@ -57,7 +57,7 @@
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <li>
                                 <a href="#"
                                    class="link-wishlist"
@@ -69,7 +69,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
index 1b9803dbea7e..9df12646f075 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
@@ -55,7 +55,7 @@
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li>
                                     <a href="#"
                                        class="link-wishlist"
@@ -67,7 +67,7 @@
                                     </a>
                                 </li>
                             <?php endif ?>
-                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                 <li>
                                     <span class="separator">|</span>
                                     <a href="#"
diff --git a/app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml b/app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml
index 6222103e65f0..29ca83973e54 100644
--- a/app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml
+++ b/app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml
@@ -28,7 +28,7 @@
  * @see Mage_CatalogInventory_Block_Qtyincrements
  */
 ?>
-<?php if ($this->getProductQtyIncrements()) : ?>
+<?php if ($this->getProductQtyIncrements()): ?>
     <div class="product-pricing">
         <?php echo $this->__('%s is available for purchase in increments of %s', $this->getProductName(), $this->getProductQtyIncrements()) ?>
     </div>
diff --git a/app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml b/app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml
index 844c2f53b10e..cd75b0269889 100644
--- a/app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml
+++ b/app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml
@@ -42,9 +42,9 @@
             </tr>
         </thead>
         <tbody>
-        <?php foreach ($this->getChildProducts() as $childProduct) : ?>
+        <?php foreach ($this->getChildProducts() as $childProduct): ?>
             <?php $childProductStockQty = $this->getProductStockQty($childProduct); ?>
-            <?php if ($childProductStockQty > 0) : ?>
+            <?php if ($childProductStockQty > 0): ?>
                 <tr>
                     <td><?php echo $childProduct->getName() ?></td>
                     <td class="a-center"><?php echo $childProductStockQty ?></td>
diff --git a/app/design/frontend/base/default/template/checkout/cart.phtml b/app/design/frontend/base/default/template/checkout/cart.phtml
index 0c844f5c7d91..dd5994231f1e 100644
--- a/app/design/frontend/base/default/template/checkout/cart.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart.phtml
@@ -53,7 +53,7 @@
                 <col width="1" />
                 <col />
                 <col width="1" />
-            <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+            <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
                 <col width="1" />
             <?php endif ?>
             <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
@@ -77,7 +77,7 @@
                         <th rowspan="<?php echo $mergedCells; ?>">&nbsp;</th>
                         <th rowspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo $this->__('Product Name') ?></span></th>
                         <th rowspan="<?php echo $mergedCells; ?>"></th>
-                        <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
                         <th rowspan="<?php echo $mergedCells; ?>" class="a-center"><span class="nobr"><?php echo $this->__('Move to Wishlist') ?></span></th>
                         <?php endif ?>
                         <th class="a-center" colspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo $this->__('Unit Price') ?></span></th>
diff --git a/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml b/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
index 4afa4ef92e4a..af76348be5a5 100644
--- a/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
@@ -52,7 +52,7 @@
                     <span><span><?php echo $this->__('Add to Cart') ?></span></span>
                 </button>
                 <ul class="add-to-links">
-                    <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                    <?php if ($this->helper('wishlist')->isAllow()): ?>
                         <li>
                             <a href="#"
                                class="link-wishlist"
@@ -64,7 +64,7 @@
                             </a>
                         </li>
                     <?php endif ?>
-                    <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_item, false)) : ?>
+                    <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_item, false)): ?>
                         <li>
                             <span class="separator">|</span>
                             <a href="#"
diff --git a/app/design/frontend/base/default/template/checkout/cart/item/default.phtml b/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
index 977fa0c2b483..af24bbbafb0d 100644
--- a/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
@@ -43,7 +43,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
         </h2>
         <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
@@ -74,7 +74,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
         <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
         <?php endif ?>
     </td>
-    <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+    <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
     <td class="a-center">
         <?php if ($isVisibleProduct): ?>
             <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo $this->__('Move'); ?></a>
diff --git a/app/design/frontend/base/default/template/checkout/cart/render/default.phtml b/app/design/frontend/base/default/template/checkout/cart/render/default.phtml
index 85f6977a2694..39f17b8705d8 100644
--- a/app/design/frontend/base/default/template/checkout/cart/render/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/render/default.phtml
@@ -39,7 +39,7 @@
             <p class="item-msg <?php if ($_item->getHasError()): ?>error<?php else: ?>notice<?php endif ?>">* <?php echo $_item->getMessage() ?></p>
         <?php endif ?>
     </td>
-    <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+    <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
     <td class="a-center">
         <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
     </td>
diff --git a/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml b/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
index 1ebcdb5f78b1..8a79e7f7c0aa 100644
--- a/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
@@ -39,7 +39,7 @@
         <p class="item-msg <?php if ($_item->getHasError()): ?>error<?php else: ?>notice<?php endif ?>">* <?php echo $_item->getMessage() ?></p>
         <?php endif ?>
     </td>
-    <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+    <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
     <td class="a-center">
         <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
     </td>
diff --git a/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml b/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml
index 8de9c0724155..ecf512fd6573 100644
--- a/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml
@@ -133,7 +133,7 @@
         <div class="truncated">
           <div class="truncated_full_value">
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd>
                     <?php if (is_array($_option['value'])): ?>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
index ea854303cbd4..96dbdf3e37a7 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
@@ -75,7 +75,7 @@
                                 <?php endif ?>
                                 <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label>
                             </dt>
-                            <?php if ($html = $this->getChildHtml('payment.method.'.$_code)) : ?>
+                            <?php if ($html = $this->getChildHtml('payment.method.'.$_code)): ?>
                             <dd>
                                 <?php echo $html; ?>
                             </dd>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml b/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml
index d3b08d872036..5f086d976ea9 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml
@@ -27,7 +27,7 @@
 <h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
 <?php if ($_options = $this->getOptionList()): ?>
 <dl class="item-options">
-    <?php foreach ($_options as $_option) : ?>
+    <?php foreach ($_options as $_option): ?>
     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
     <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml b/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
index 61f4caed7c95..be310164f5b9 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
@@ -69,7 +69,7 @@
                                            <?php if ($_rate->getErrorMessage()): ?>
                                                 <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
                                            <?php else: ?>
-                                                <?php if ($_sole) : ?>
+                                                <?php if ($_sole): ?>
                                                 <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
                                                 <?php else: ?>
                                                 <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if ($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
diff --git a/app/design/frontend/base/default/template/checkout/onepage/billing.phtml b/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
index 330f8235f8ee..1abb5e88df2a 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
@@ -71,7 +71,7 @@
                     </div>
                 </li>
         <?php endfor ?>
-                <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+                <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
                 <li class="wide">
                     <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
                     <div class="input-box">
diff --git a/app/design/frontend/base/default/template/checkout/onepage/failure.phtml b/app/design/frontend/base/default/template/checkout/onepage/failure.phtml
index af2e9b860ef8..6a3a88345813 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/failure.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/failure.phtml
@@ -27,6 +27,6 @@
 <div class="page-title">
     <h1><?php echo $this->__('An error occurred in the process of payment') ?></h1>
 </div>
-<?php if ($this->getRealOrderId()) : ?><p><?php echo $this->__('Order #') . $this->getRealOrderId() ?></p><?php endif ?>
-<?php if ($error = $this->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
+<?php if ($this->getRealOrderId()): ?><p><?php echo $this->__('Order #') . $this->getRealOrderId() ?></p><?php endif ?>
+<?php if ($error = $this->getErrorMessage()): ?><p><?php echo $error ?></p><?php endif ?>
 <p><?php echo $this->__('Click <a href="%s">here</a> to continue shopping.', Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl())) ?></p>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml b/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
index 9f1d233a3fe9..8717c8080bc2 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
@@ -29,7 +29,7 @@
     <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
         <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
index d448c458c134..0e5ce70f502a 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
@@ -62,7 +62,7 @@
                         </div>
                     </li>
             <?php endfor ?>
-                    <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+                    <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
                     <li class="wide">
                         <label for="shipping:vat_id"><?php echo $this->__('VAT Number'); ?></label>
                         <div class="input-box">
diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml
index 7b3721052910..c72f41819c6b 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml
@@ -41,7 +41,7 @@
                    <?php if ($_rate->getErrorMessage()): ?>
                     <ul class="messages"><li class="error-msg"><ul><li><?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></li></ul></li></ul>
                    <?php else: ?>
-                        <?php if ($_sole) : ?>
+                        <?php if ($_sole): ?>
                         <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
                         <?php else: ?>
                         <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if ($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio"/>
diff --git a/app/design/frontend/base/default/template/customer/address/edit.phtml b/app/design/frontend/base/default/template/customer/address/edit.phtml
index 2a3cf37cba5b..4158c5bac852 100644
--- a/app/design/frontend/base/default/template/customer/address/edit.phtml
+++ b/app/design/frontend/base/default/template/customer/address/edit.phtml
@@ -87,7 +87,7 @@
                 </div>
             </li>
         <?php endfor ?>
-            <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+            <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
             <li class="wide">
                 <label for="vat_id"><?php echo $this->__('VAT Number') ?></label>
                 <div class="input-box">
diff --git a/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml
index beecaa2d80a2..74d845ab4d0c 100644
--- a/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml
+++ b/app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml
@@ -41,7 +41,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
     </h2>
     <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
@@ -80,7 +80,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
     <a href="<?php echo $this->getConfigureUrl() ?>"
        title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
 </td>
-<?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+<?php if ($this->helper('wishlist')->isAllowInCart()): ?>
     <td class="a-center">
         <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>"
            class="link-wishlist"><?php echo $this->__('Move'); ?></a>
diff --git a/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml
index d9179d517782..9c2634a768ac 100644
--- a/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml
@@ -28,7 +28,7 @@
 <!-- item custom options -->
 <?php if ($_options = $this->getOptionList()): ?>
 <dl class="item-options">
-    <?php foreach ($_options as $_option) : ?>
+    <?php foreach ($_options as $_option): ?>
     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
     <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml
index 9c9fa8a5f7da..6278c0e803c5 100644
--- a/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml
@@ -30,7 +30,7 @@
         <!-- item custom options -->
         <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
index 54e46290ec76..49a161b7420f 100644
--- a/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -30,7 +30,7 @@
 <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
index 32665059c1ce..9c7ce25fda70 100644
--- a/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
@@ -30,7 +30,7 @@
 <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
index 892dcd6856bb..735b6d53df57 100644
--- a/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
+++ b/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
@@ -29,7 +29,7 @@
 <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml
index eac07c3a88ce..cf0ee6f2de9f 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml
@@ -42,7 +42,7 @@ $logo = $this->getSkinUrl('images/logo-large.gif', array('_area' => 'adminhtml',
                 <div id="messages">
                     <?php echo $this->getMessagesBlock()->toHtml() ?>
                 </div>
-                <?php if (!$this->getHasException()) : ?>
+                <?php if (!$this->getHasException()): ?>
                     <h2><?php echo $this->__('<strong>%s</strong> requests access to your account', $this->escapeHtml($this->getConsumer()->getName())); ?></h2>
                     <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
                     <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
diff --git a/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml
index 580c16ee6e0d..8d1230a3289f 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml
@@ -37,7 +37,7 @@
         </div>
         <div class="form-box">
             <?php echo $this->getMessagesBlock()->toHtml() ?>
-            <?php if (!$this->getHasException()) : ?>
+            <?php if (!$this->getHasException()): ?>
             <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
                 <?php echo $this->getBlockHtml('formkey'); ?>
                 <fieldset class="fieldset">
diff --git a/app/design/frontend/base/default/template/oauth/customer/token/list.phtml b/app/design/frontend/base/default/template/oauth/customer/token/list.phtml
index 33f5aa01f806..0a81a7a60e64 100644
--- a/app/design/frontend/base/default/template/oauth/customer/token/list.phtml
+++ b/app/design/frontend/base/default/template/oauth/customer/token/list.phtml
@@ -45,7 +45,7 @@
             </thead>
             <tbody>
                 <?php /** @var $item Mage_Oauth_Model_Token */ ?>
-                <?php foreach ($this->getCollection() as $item) : ?>
+                <?php foreach ($this->getCollection() as $item): ?>
                 <tr>
                     <td><span class="app-name">
                         <?php echo $this->escapeHtml($item->getName()); ?></span></td>
diff --git a/app/design/frontend/base/default/template/paypal/hss/redirect.phtml b/app/design/frontend/base/default/template/paypal/hss/redirect.phtml
index 4dbfc195043c..c79d707ab435 100644
--- a/app/design/frontend/base/default/template/paypal/hss/redirect.phtml
+++ b/app/design/frontend/base/default/template/paypal/hss/redirect.phtml
@@ -50,7 +50,7 @@ if (window.top == window.self) {
     <?php if ($this->getErrorMsg()): ?>
         alert('<?php echo Mage::helper('core')->jsQuoteEscape($this->getErrorMsg()) ?>');
     <?php endif ?>
-<?php elseif ($this->getGotoSuccessPage()) : ?>
+<?php elseif ($this->getGotoSuccessPage()): ?>
     window.top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
 <?php else: ?>
     window.top.location="<?php echo $this->getUrl('checkout/cart') ?>";
diff --git a/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml b/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml
index 57ae50dc848f..31b11a5f1f5a 100644
--- a/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml
+++ b/app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml
@@ -59,7 +59,7 @@
     <?php if ($this->getErrorMsg()): ?>
         alert('<?php echo $this->jsQuoteEscape($this->getErrorMsg()) ?>');
     <?php endif ?>
-<?php elseif ($this->getGotoSuccessPage()) : ?>
+<?php elseif ($this->getGotoSuccessPage()): ?>
     window_top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
 <?php else: ?>
     window_top.location="<?php echo $this->getUrl('checkout/cart') ?>";
diff --git a/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml b/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml
index cd56bf895a26..d73f7333405c 100644
--- a/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml
+++ b/app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml
@@ -59,7 +59,7 @@
     <?php if ($this->getErrorMsg()): ?>
         alert('<?php echo $this->jsQuoteEscape($this->getErrorMsg()) ?>');
     <?php endif ?>
-<?php elseif ($this->getGotoSuccessPage()) : ?>
+<?php elseif ($this->getGotoSuccessPage()): ?>
     window_top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
 <?php else: ?>
     window_top.location="<?php echo $this->getUrl('checkout/cart') ?>";
diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
index 33a7439a4a0f..a7c322910950 100644
--- a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
+++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
@@ -72,7 +72,7 @@
                     </div>
                 </li>
         <?php endfor ?>
-                <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+                <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
                 <li class="wide">
                     <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
                     <div class="input-box">
diff --git a/app/design/frontend/base/default/template/poll/active.phtml b/app/design/frontend/base/default/template/poll/active.phtml
index 162d1a82c012..ecc335df614e 100644
--- a/app/design/frontend/base/default/template/poll/active.phtml
+++ b/app/design/frontend/base/default/template/poll/active.phtml
@@ -24,7 +24,7 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if (isset($poll)) : ?>
+<?php if (isset($poll)): ?>
 <script type="text/javascript">
 //<![CDATA[
     function validatePollAnswerIsSelected()
diff --git a/app/design/frontend/base/default/template/poll/result.phtml b/app/design/frontend/base/default/template/poll/result.phtml
index 0c98c314f2f9..17e4c08076ac 100644
--- a/app/design/frontend/base/default/template/poll/result.phtml
+++ b/app/design/frontend/base/default/template/poll/result.phtml
@@ -24,7 +24,7 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if (isset($poll)) : ?>
+<?php if (isset($poll)): ?>
 <div class="block block-poll">
     <div class="block-title">
         <strong><span><?php echo $this->__('Community Poll') ?></span></strong>
diff --git a/app/design/frontend/base/default/template/reports/home_product_compared.phtml b/app/design/frontend/base/default/template/reports/home_product_compared.phtml
index 7687a385c97b..07662d23124f 100644
--- a/app/design/frontend/base/default/template/reports/home_product_compared.phtml
+++ b/app/design/frontend/base/default/template/reports/home_product_compared.phtml
@@ -52,7 +52,7 @@
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_product, false); ?>
                             <li>
                                 <a href="#"
@@ -64,7 +64,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
diff --git a/app/design/frontend/base/default/template/reports/home_product_viewed.phtml b/app/design/frontend/base/default/template/reports/home_product_viewed.phtml
index 2d7fe97bf021..1803f4c8cc53 100644
--- a/app/design/frontend/base/default/template/reports/home_product_viewed.phtml
+++ b/app/design/frontend/base/default/template/reports/home_product_viewed.phtml
@@ -58,7 +58,7 @@
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_product, false); ?>
                             <li>
                                 <a href="#"
@@ -70,7 +70,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
diff --git a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml
index 8bd0d534ddca..dcc287361289 100644
--- a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml
@@ -56,7 +56,7 @@
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <li>
                                 <a href="#"
                                    class="link-wishlist"
@@ -68,7 +68,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
diff --git a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml
index 190d6acbac78..93140971b917 100644
--- a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml
@@ -54,7 +54,7 @@
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li>
                                     <a href="#"
                                        class="link-wishlist"
@@ -66,7 +66,7 @@
                                     </a>
                                 </li>
                             <?php endif ?>
-                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                 <li>
                                     <span class="separator">|</span>
                                     <a href="#"
diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml
index 6e3bab2513b2..bbf50d99bba2 100644
--- a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml
@@ -61,7 +61,7 @@
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li>
                                     <a href="#"
                                        class="link-wishlist"
@@ -73,7 +73,7 @@
                                     </a>
                                 </li>
                             <?php endif ?>
-                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                 <li>
                                     <span class="separator">|</span>
                                     <a href="#"
diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml
index 5c8f365f5cfd..89b740c9fe3c 100644
--- a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml
@@ -59,7 +59,7 @@
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li>
                                     <a href="#"
                                        class="link-wishlist"
@@ -71,7 +71,7 @@
                                     </a>
                                 </li>
                             <?php endif ?>
-                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                 <li>
                                     <span class="separator">|</span>
                                     <a href="#"
diff --git a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
index fa061016365c..4201cbd7824e 100644
--- a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
@@ -30,7 +30,7 @@
 <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
@@ -51,7 +51,7 @@
         </dl>
     <?php endif ?>
     <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-    <?php if ($addInfoBlock) : ?>
+    <?php if ($addInfoBlock): ?>
         <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
     <?php endif ?>
     <?php echo $this->escapeHtml($_item->getDescription()) ?>
diff --git a/app/design/frontend/base/default/template/sales/order/history.phtml b/app/design/frontend/base/default/template/sales/order/history.phtml
index 896ee03376b4..5d1326633bfa 100644
--- a/app/design/frontend/base/default/template/sales/order/history.phtml
+++ b/app/design/frontend/base/default/template/sales/order/history.phtml
@@ -60,7 +60,7 @@
             <td class="a-center">
                 <span class="nobr"><a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo $this->__('View Order') ?></a>
                     <?php /*<span class="separator">|</span><a href="<?php echo $this->getTrackUrl($_order) ?>"><?php echo $this->__('Track Order') ?></a>&nbsp;*/ ?>
-                    <?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
+                    <?php if ($this->helper('sales/reorder')->canReorder($_order)): ?>
                     <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo $this->__('Reorder') ?></a>
                 <?php endif ?>
                 </span>
diff --git a/app/design/frontend/base/default/template/sales/order/info/buttons.phtml b/app/design/frontend/base/default/template/sales/order/info/buttons.phtml
index 826ded0863b9..5bb0bd9dd85b 100644
--- a/app/design/frontend/base/default/template/sales/order/info/buttons.phtml
+++ b/app/design/frontend/base/default/template/sales/order/info/buttons.phtml
@@ -30,7 +30,7 @@
     <a href="<?php echo $this->helper('rss/order')->getStatusHistoryRssUrl($_order) ?>" class="link-rss f-none"><?php echo $this->__('Subscribe to Order Status') ?></a>
     <span class="separator">|</span>
 <?php endif ?>
-<?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
+<?php if ($this->helper('sales/reorder')->canReorder($_order)): ?>
     <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo $this->__('Reorder') ?></a>
     <span class="separator">|</span>
 <?php endif ?>
diff --git a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
index 541ac2c28b5d..1d39ebe62e44 100644
--- a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
@@ -30,7 +30,7 @@
 <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
@@ -52,7 +52,7 @@
         </dl>
     <?php endif ?>
     <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-    <?php if ($addInfoBlock) : ?>
+    <?php if ($addInfoBlock): ?>
         <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
     <?php endif ?>
     <?php echo $this->escapeHtml($_item->getDescription()) ?>
diff --git a/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
index 2eff26ddcc4b..da7e00576a3f 100644
--- a/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
@@ -29,7 +29,7 @@
     <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
         <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
+        <?php foreach ($_options as $_option): ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/sales/order/recent.phtml b/app/design/frontend/base/default/template/sales/order/recent.phtml
index dbd80f9519a9..5c0979b0594e 100644
--- a/app/design/frontend/base/default/template/sales/order/recent.phtml
+++ b/app/design/frontend/base/default/template/sales/order/recent.phtml
@@ -59,7 +59,7 @@
                     <td class="a-center">
                         <span class="nobr">
                         <a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo $this->__('View Order') ?></a>
-                        <?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
+                        <?php if ($this->helper('sales/reorder')->canReorder($_order)): ?>
                             <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo $this->__('Reorder') ?></a>
                         <?php endif ?>
                         </span>
diff --git a/app/design/frontend/base/default/template/sales/order/shipment/items.phtml b/app/design/frontend/base/default/template/sales/order/shipment/items.phtml
index 34d5b9227ba2..c36fad5ffbfd 100644
--- a/app/design/frontend/base/default/template/sales/order/shipment/items.phtml
+++ b/app/design/frontend/base/default/template/sales/order/shipment/items.phtml
@@ -26,7 +26,7 @@
 ?>
 <?php  $_order = $this->getOrder() ?>
 <p class="order-links">
-    <?php  if ($_order->getTracksCollection()->count()) : ?>
+    <?php  if ($_order->getTracksCollection()->count()): ?>
         <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track all shipment(s)')) ?>"><?php echo $this->__('Track all shipments') ?></a> <span class="separator">|</span>
     <?php endif ?>
     <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo $this->__('Print All Shipments') ?></a>
diff --git a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
index a69d647a785f..ae1ec5e6a2c9 100644
--- a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
@@ -30,7 +30,7 @@
     <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
+        <?php foreach ($_options as $_option): ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/base/default/template/sales/order/view.phtml b/app/design/frontend/base/default/template/sales/order/view.phtml
index aa8644f0bc2e..9ba2b1b2e914 100644
--- a/app/design/frontend/base/default/template/sales/order/view.phtml
+++ b/app/design/frontend/base/default/template/sales/order/view.phtml
@@ -56,7 +56,7 @@
     <?php endif ?>
     <?php $_order = $this->getOrder() ?>
     <h2 class="table-caption"><?php echo $this->__('Items Ordered') ?>
-        <?php if ($_order->getTracksCollection()->count()) : ?>
+        <?php if ($_order->getTracksCollection()->count()): ?>
             <span class="separator">|</span> <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','top=0,left=0,width=800,height=600,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track your order')) ?>"><?php echo $this->__('Track your order') ?></a>
         <?php endif ?>
     </h2>
diff --git a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml
index ed9c0a0b5cb6..abf61ea28114 100644
--- a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml
+++ b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml
@@ -56,7 +56,7 @@
                     <?php if ($track->getErrorMessage()): ?>
                     <tr>
                         <th class="label"><?php echo $this->__('Error:'); ?></th>
-                        <td class="error"><?php echo $this->__('Tracking information is currently not available. Please '); if ($this->getContactUsEnabled()) : ?><a href="<?php echo $this->getContactUs() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('contact us')) ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or '); endif; echo $this->__('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
+                        <td class="error"><?php echo $this->__('Tracking information is currently not available. Please '); if ($this->getContactUsEnabled()): ?><a href="<?php echo $this->getContactUs() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('contact us')) ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or '); endif; echo $this->__('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
                     </tr>
                     <?php elseif ($track->getTrackSummary()): ?>
                     <tr>
diff --git a/app/design/frontend/base/default/template/tag/customer/view.phtml b/app/design/frontend/base/default/template/tag/customer/view.phtml
index 272b5393bab8..f9460edeee16 100644
--- a/app/design/frontend/base/default/template/tag/customer/view.phtml
+++ b/app/design/frontend/base/default/template/tag/customer/view.phtml
@@ -56,7 +56,7 @@
                     <?php $params['product'] = $_product->getId(); ?>
                     <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add', $params) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
                 <?php endif ?>
-                <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                <?php if ($this->helper('wishlist')->isAllow()): ?>
                 <ul class="add-to-links">
                     <li>
                         <a href="<?php echo $this->getUrl('wishlist/index/add',array('product'=>$_product->getId())) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a>
diff --git a/app/design/frontend/base/default/template/tax/checkout/shipping.phtml b/app/design/frontend/base/default/template/tax/checkout/shipping.phtml
index abaa1943488c..c5d628b7ce7c 100644
--- a/app/design/frontend/base/default/template/tax/checkout/shipping.phtml
+++ b/app/design/frontend/base/default/template/tax/checkout/shipping.phtml
@@ -45,7 +45,7 @@
         <?php echo $this->helper('checkout')->formatPrice($this->getShippingIncludeTax()) ?>
     </td>
 </tr>
-<?php elseif ($this->displayIncludeTax()) : ?>
+<?php elseif ($this->displayIncludeTax()): ?>
 <tr>
     <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
         <?php echo $this->getTotal()->getTitle() ?>
diff --git a/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml b/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml
index 8f47f23ebbdd..d7046d4e37b1 100644
--- a/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml
+++ b/app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml
@@ -28,12 +28,12 @@
 <?php $_wishlistItem = $this->getWishlistItem(); ?>
 <?php $_wishlistSubmitUrl = $this->helper('wishlist')->getUpdateUrl($_wishlistItem); ?>
 <ul class="add-to-links">
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <li><a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, this.href); return false;" class="link-compare"><?php echo $this->__('Update Wishlist') ?></a></li>
 <?php endif ?>
 <?php $_product = $this->getProduct(); ?>
 <?php $_compareUrl = $this->helper('catalog/product_compare')->getAddUrlCustom($_product, false); ?>
-<?php if ($_compareUrl) : ?>
+<?php if ($_compareUrl): ?>
     <li>
         <span class="separator">|</span>
         <a href="#"
diff --git a/app/design/frontend/base/default/template/wishlist/sidebar.phtml b/app/design/frontend/base/default/template/wishlist/sidebar.phtml
index ed2910abd50a..a64134ef1f80 100644
--- a/app/design/frontend/base/default/template/wishlist/sidebar.phtml
+++ b/app/design/frontend/base/default/template/wishlist/sidebar.phtml
@@ -25,7 +25,7 @@
  */
 /* @var $this Mage_Wishlist_Block_Customer_Sidebar */
 ?>
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
 <div class="block block-wishlist">
     <div class="block-title">
         <strong><span><?php echo $this->getTitle(); ?></span></strong>
diff --git a/app/design/frontend/base/default/template/wishlist/view.phtml b/app/design/frontend/base/default/template/wishlist/view.phtml
index 5744056cad55..dbb9e9287756 100644
--- a/app/design/frontend/base/default/template/wishlist/view.phtml
+++ b/app/design/frontend/base/default/template/wishlist/view.phtml
@@ -25,7 +25,7 @@
  */
 /* @var $this Mage_Wishlist_Block_Customer_Wishlist */
 ?>
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <div class="my-wishlist">
         <div class="page-title title-buttons">
             <?php if ($this->helper('wishlist')->isRssAllow() && $this->hasWishlistItems()): ?>
diff --git a/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml
index a84e333eb4f1..a9a510496c07 100644
--- a/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml
+++ b/app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml
@@ -395,7 +395,7 @@
         <td>
             <?php if ($_options = $this->getItemOptions()): ?>
                 <dl class="item-options">
-                    <?php foreach ($_options as $_option) : ?>
+                    <?php foreach ($_options as $_option): ?>
                         <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                         <?php if (!$this->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/default/iphone/template/catalog/product/list.phtml b/app/design/frontend/default/iphone/template/catalog/product/list.phtml
index 131cd7851cd4..3d9648d28a8f 100644
--- a/app/design/frontend/default/iphone/template/catalog/product/list.phtml
+++ b/app/design/frontend/default/iphone/template/catalog/product/list.phtml
@@ -63,7 +63,7 @@
                             <li><a href="<?php echo $_product->getProductUrl() ?>" class="i-view-details"><i></i><?php echo $this->__('View Details') ?></a></li>
                             <li><a href="<?php echo $this->getUrl('catalog/product/gallery', array('id'=>$_product->getId())) ?>" class="i-view-gallery"><i></i><?php echo $this->__('View Gallery') ?></a></li>
                             <li><a href="<?php echo $this->helper('catalog/product')->getEmailToFriendUrl($_product) ?>" class="i-send-friend"><i></i><?php echo $this->__('Tell a Friend') ?></a></li>
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li><a href="<?php echo $this->helper('wishlist')->getAddUrl($_product) ?>" class="i-send-wishlist"><i></i><?php echo $this->__('Add to Wishlist') ?></a></li>
                             <?php endif ?>
                             <li><a href="<?php echo $this->getAddToCartUrl($_product) ?>" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>'); return false;" class="i-add-to-cart"><i></i><?php echo $this->__('Add to Cart') ?></a></li>
diff --git a/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml b/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml
index a859406e1a8d..c14c9865276a 100644
--- a/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml
+++ b/app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml
@@ -29,7 +29,7 @@
 <?php $_wishlistSubmitUrl = $this->helper('wishlist')->getAddUrl($_product); ?>
 
 <ul class="add-to-links">
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <li><a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, this.href); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
 <?php endif ?>
 <?php if ($this->canEmailToFriend()): ?>
diff --git a/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml b/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml
index 93b61b61b075..318bf5f46152 100644
--- a/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml
@@ -288,7 +288,7 @@ $_options = $this->getOptionList();
         <span class="toggle" onclick="$(this).next('.product-options').toggle(); return false;">Show Options</span>
         <div class="product-options" style="display:none;">
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
diff --git a/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml b/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml
index 271012ca0c03..526778ba5c69 100644
--- a/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml
@@ -32,7 +32,7 @@
 
             <?php if ($_options = $this->getOptionList()): ?>
                 <dl class="item-options">
-                    <?php foreach ($_options as $_option) : ?>
+                    <?php foreach ($_options as $_option): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml
index 8aad928a2b4b..993de966df9f 100644
--- a/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml
+++ b/app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml
@@ -286,7 +286,7 @@
         <span class="toggle" onclick="$(this).next().toggle(); return false;">Show Options</span>
         <div class="product-options" style="display:none;">
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
diff --git a/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml
index dd42121aadde..d470fcbaa249 100644
--- a/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml
@@ -32,7 +32,7 @@
             <!-- item custom options -->
             <?php if ($_options = $this->getOptionList()): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
index a24c3fe37d65..8a61485cc3fd 100644
--- a/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -31,7 +31,7 @@
     <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if ($_options = $this->getItemOptions()): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$this->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
index 65de9356ae1f..5f75bb96658a 100644
--- a/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
@@ -31,7 +31,7 @@
     <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if ($_options = $this->getItemOptions()): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$this->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml
index 43ea6dfbb444..abef3c971bbe 100644
--- a/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml
+++ b/app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml
@@ -34,7 +34,7 @@ $links = $this->getLinks();
     <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
         <?php if ($_options): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$this->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml
index f3a58f41733d..f0f99884ff77 100644
--- a/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml
+++ b/app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml
@@ -32,7 +32,7 @@
     <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if ($_options = $this->getItemOptions()): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$this->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
@@ -53,7 +53,7 @@
             </dl>
         <?php endif ?>
         <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) : ?>
+        <?php if ($addInfoBlock): ?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
diff --git a/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml
index b34c1854c940..a6b7de060439 100644
--- a/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml
+++ b/app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml
@@ -32,7 +32,7 @@
     <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
         <?php if ($_options = $this->getItemOptions()): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$this->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
@@ -54,7 +54,7 @@
             </dl>
         <?php endif ?>
         <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) : ?>
+        <?php if ($addInfoBlock): ?>
             <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
         <?php endif ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
diff --git a/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml b/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml
index 225fd165c011..792acf194663 100644
--- a/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml
+++ b/app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml
@@ -34,7 +34,7 @@ $_options = $this->getItemOptions();
     <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
         <?php if ($_options): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$this->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
@@ -58,7 +58,7 @@ $_options = $this->getItemOptions();
             </dl>
         <?php endif ?>
         <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addtInfoBlock) : ?>
+        <?php if ($addtInfoBlock): ?>
             <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
         <?php endif ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
diff --git a/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml b/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml
index b6626375e07f..5f152c4ebc37 100644
--- a/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml
+++ b/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml
@@ -52,7 +52,7 @@
             <?php if ($track->getErrorMessage()): ?>
             <tr>
                 <td class="first label"><?php echo $this->__('Error:'); ?></td>
-                <td class="error"><?php echo $this->__('Tracking information is currently not available. Please '); if ($this->getContactUsEnabled()) : ?><a href="<?php echo $this->getContactUs() ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or '); endif; echo $this->__('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
+                <td class="error"><?php echo $this->__('Tracking information is currently not available. Please '); if ($this->getContactUsEnabled()): ?><a href="<?php echo $this->getContactUs() ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or '); endif; echo $this->__('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
             </tr>
             <?php elseif ($track->getTrackSummary()): ?>
             <tr>
diff --git a/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml b/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml
index f64ab6794522..5aa06738019c 100644
--- a/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml
+++ b/app/design/frontend/default/iphone/template/wishlist/item/configure/addto.phtml
@@ -28,7 +28,7 @@
 <?php $_wishlistItem = $this->getWishlistItem(); ?>
 <?php $_wishlistSubmitUrl = $this->helper('wishlist')->getUpdateUrl($_wishlistItem); ?>
 <ul class="add-to-links">
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <li><a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, this.href); return false;" class="link-compare"><?php echo $this->__('Update Wishlist') ?></a></li>
 <?php endif ?>
 </ul>
diff --git a/app/design/frontend/default/iphone/template/wishlist/view.phtml b/app/design/frontend/default/iphone/template/wishlist/view.phtml
index cece6a8996f5..660b669cd77e 100644
--- a/app/design/frontend/default/iphone/template/wishlist/view.phtml
+++ b/app/design/frontend/default/iphone/template/wishlist/view.phtml
@@ -25,7 +25,7 @@
  */
 /* @var $this Mage_Wishlist_Block_Customer_Wishlist */
 ?>
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <div class="my-wishlist">
         <div class="page-title title-buttons">
             <h1><?php echo $this->getTitle(); ?></h1>
diff --git a/app/design/frontend/default/modern/template/catalog/product/list.phtml b/app/design/frontend/default/modern/template/catalog/product/list.phtml
index 56f33eab6f2a..c7ed7b83c73d 100644
--- a/app/design/frontend/default/modern/template/catalog/product/list.phtml
+++ b/app/design/frontend/default/modern/template/catalog/product/list.phtml
@@ -67,7 +67,7 @@
                         <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>" class="link-learn"><?php echo $this->__('Learn More') ?></a>
                     </div>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <li><a href="<?php echo $this->helper('wishlist')->getAddUrl($_product) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
                         <?php endif ?>
                         <?php if ($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
@@ -105,7 +105,7 @@
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <li><a href="<?php echo $this->helper('wishlist')->getAddUrl($_product) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
                         <?php endif ?>
                         <?php if ($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
diff --git a/app/design/frontend/default/modern/template/checkout/cart.phtml b/app/design/frontend/default/modern/template/checkout/cart.phtml
index 235ef430d615..e0c71017deaa 100644
--- a/app/design/frontend/default/modern/template/checkout/cart.phtml
+++ b/app/design/frontend/default/modern/template/checkout/cart.phtml
@@ -52,7 +52,7 @@
                 <col width="1" />
                 <col />
                 <col width="1" />
-            <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+            <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
                 <col width="1" />
             <?php endif ?>
             <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
@@ -76,7 +76,7 @@
                         <th rowspan="<?php echo $mergedCells; ?>">&nbsp;</th>
                         <th rowspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo $this->__('Product Name') ?></span></th>
                         <th rowspan="<?php echo $mergedCells; ?>"></th>
-                        <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
                         <th rowspan="<?php echo $mergedCells; ?>" class="a-center"><span class="nobr"><?php echo $this->__('Move to Wishlist') ?></span></th>
                         <?php endif ?>
                         <th class="a-center" colspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo $this->__('Unit Price') ?></span></th>
diff --git a/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml
index 7eecc001c952..ae52f7146fdd 100644
--- a/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml
+++ b/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml
@@ -346,7 +346,7 @@
     <td>
         <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
+        <?php foreach ($_options as $_option): ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml b/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml
index 9422aa684d1d..32c0635f81f9 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml
@@ -88,7 +88,7 @@
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
-                    <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                    <?php if ($this->helper('wishlist')->isAllow()): ?>
                         <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_item, false); ?>
                         <ul class="add-to-links">
                             <li>
@@ -160,7 +160,7 @@
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                     <?php endif ?>
-                    <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                    <?php if ($this->helper('wishlist')->isAllow()): ?>
                         <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_item, false); ?>
                         <ul class="add-to-links">
                             <li>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/list.phtml b/app/design/frontend/rwd/default/template/catalog/product/list.phtml
index 742d1878dd45..3a16de3ac2c8 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/list.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/list.phtml
@@ -105,7 +105,7 @@
                             <p class="action availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <?php $_wishlistUrl = $this->helper('wishlist')->getAddUrlWithCustomParams($_product, array(), false); ?>
                                 <li>
                                     <a href="#"
@@ -117,7 +117,7 @@
                                     </a>
                                 </li>
                             <?php endif ?>
-                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                 <li>
                                     <span class="separator">|</span>
                                     <a href="#"
@@ -192,7 +192,7 @@
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <?php $_wishlistUrl = $this->helper('wishlist')->getAddUrlWithCustomParams($_product, array(), false); ?>
                                 <li>
                                     <a href="#"
@@ -204,7 +204,7 @@
                                     </a>
                                 </li>
                             <?php endif ?>
-                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                 <li>
                                     <span class="separator">|</span>
                                     <a href="#"
diff --git a/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml b/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml
index 2e77148ef59a..08f2efcfae68 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml
@@ -44,7 +44,7 @@
                     <div class="product-details">
                         <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
                         <?php echo $this->getPriceHtml($_item, true, '-related') ?>
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <a href="#"
                                class="link-wishlist"
                                onclick="customFormSubmit(
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml
index 2890afb1456a..d52b5436465c 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml
@@ -30,7 +30,7 @@
 <?php $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()))); ?>
 
 <ul class="add-to-links">
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <li>
         <a href="<?php echo $_wishlistSubmitUrl ?>"
            onclick="productAddToCartForm.submitLight(this, this.href); return false;"
@@ -42,7 +42,7 @@
 <?php
     $_compareUrl = $this->helper('catalog/product_compare')->getAddUrlCustom($_product, false);
 ?>
-<?php if ($_compareUrl) : ?>
+<?php if ($_compareUrl): ?>
     <li>
         <span class="separator">|</span>
         <a href="#"
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml
index a1b3ac1f7787..cf8aa13f2ec1 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml
@@ -58,7 +58,7 @@
                     </p>
                     <?php if ($_product->isSaleable()): ?>
                     <div class="qty-wrapper">
-                        <?php if ($_item->isSaleable()) : ?>
+                        <?php if ($_item->isSaleable()): ?>
                             <input id="super_group_<?php echo $_item->getId() ?>" type="text" pattern="\d*(\.\d+)?" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty() * 1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
                             <label for="super_group_<?php echo $_item->getId() ?>" class="qty-label">
                                 <?php echo $this->__('Quantity'); ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
index 529f6a2f5349..7dda02c4de05 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
@@ -61,7 +61,7 @@
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                             <?php endif ?>
                             <ul class="add-to-links">
-                                <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                                <?php if ($this->helper('wishlist')->isAllow()): ?>
                                     <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_product, false); ?>
                                     <li>
                                         <a href="#"
@@ -73,7 +73,7 @@
                                         </a>
                                     </li>
                                 <?php endif ?>
-                                <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                                <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                     <li>
                                         <span class="separator">|</span>
                                         <a href="#"
diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
index 67aa61e22f8a..9a3ac592e793 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
@@ -47,7 +47,7 @@
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
                             <?php endif ?>
                             <?php if ($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
diff --git a/app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml b/app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml
index 6502a9c1e6f1..011c023faa30 100644
--- a/app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml
+++ b/app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml
@@ -42,9 +42,9 @@
             </tr>
         </thead>
         <tbody>
-        <?php foreach ($this->getChildProducts() as $childProduct) : ?>
+        <?php foreach ($this->getChildProducts() as $childProduct): ?>
             <?php $childProductStockQty = $this->getProductStockQty($childProduct); ?>
-            <?php if ($childProductStockQty > 0) : ?>
+            <?php if ($childProductStockQty > 0): ?>
                 <tr>
                     <td><?php echo $childProduct->getName() ?></td>
                     <td class="a-center"><?php echo $childProductStockQty ?></td>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart.phtml b/app/design/frontend/rwd/default/template/checkout/cart.phtml
index 0e8250bcb11d..e21a8f2f53ae 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart.phtml
@@ -77,7 +77,7 @@
                     <th rowspan="<?php echo $mergedCells; ?>" class="a-center">
                         <?php echo $this->__('Qty') ?>
 
-                        <?php /*if ($this->helper('wishlist')->isAllowInCart()) : ?>
+                        <?php /*if ($this->helper('wishlist')->isAllowInCart()): ?>
                             <span class="nobr"><?php echo $this->__('Move to Wishlist') ?></span>
                         <?php endif*/ ?>
 
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml b/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml
index 4234400293b8..a5562cb56e78 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml
@@ -55,7 +55,7 @@
                         <span><span><?php echo $this->__('Add to Cart') ?></span></span>
                     </button>
                     <ul class="add-to-links">
-                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                             <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_item, false); ?>
                             <li>
                                 <a href="#"
@@ -67,7 +67,7 @@
                                 </a>
                             </li>
                         <?php endif ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_item, false)) : ?>
+                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_item, false)): ?>
                             <li>
                                 <span class="separator">|</span>
                                 <a href="#"
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
index 9d5569da286f..6dc7e8e6e064 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
@@ -48,7 +48,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
                 </li>
             <?php endif ?>
 
-            <?php if ($this->helper('wishlist')->isAllowInCart() && $isVisibleProduct) : ?>
+            <?php if ($this->helper('wishlist')->isAllowInCart() && $isVisibleProduct): ?>
                 <li>
                     <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo $this->__('Move to wishlist'); ?></a>
                 </li>
@@ -79,7 +79,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
 
         <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
@@ -226,7 +226,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
                 </li>
             <?php endif ?>
 
-            <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+            <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
             <li>
                 <?php if ($isVisibleProduct): ?>
                     <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo $this->__('Move to wishlist'); ?></a>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
index 770bc1945172..7604a7b85329 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
@@ -171,7 +171,7 @@
         <div class="truncated">
           <div class="truncated_full_value">
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd>
                     <?php if (is_array($_option['value'])): ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml
index f8abe66570e8..b80c668d17fe 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml
@@ -39,7 +39,7 @@
             <p class="item-msg <?php if ($_item->getHasError()): ?>error<?php else: ?>notice<?php endif ?>">* <?php echo $_item->getMessage() ?></p>
         <?php endif ?>
     </td>
-    <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+    <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
     <td class="a-center">
         <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
     </td>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml b/app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml
index 144a89fee675..be5c335a2d6d 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml
@@ -39,7 +39,7 @@
         <p class="item-msg <?php if ($_item->getHasError()): ?>error<?php else: ?>notice<?php endif ?>">* <?php echo $_item->getMessage() ?></p>
         <?php endif ?>
     </td>
-    <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
+    <?php if ($this->helper('wishlist')->isAllowInCart()): ?>
     <td class="a-center">
         <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
     </td>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml
index 2b212db92452..6418ac679b12 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml
@@ -133,7 +133,7 @@
         <div class="truncated">
           <div class="truncated_full_value">
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
+                <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd>
                     <?php if (is_array($_option['value'])): ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml b/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
index 92c4bbd1c085..c4ec94177e43 100644
--- a/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
@@ -76,7 +76,7 @@
                                 <?php endif ?>
                                 <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label>
                             </dt>
-                            <?php if ($html = $this->getChildHtml('payment.method.'.$_code)) : ?>
+                            <?php if ($html = $this->getChildHtml('payment.method.'.$_code)): ?>
                             <dd>
                                 <?php echo $html; ?>
                             </dd>
diff --git a/app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml
index a00e0c62a042..6aa4e3220814 100644
--- a/app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml
@@ -27,7 +27,7 @@
 <h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
 <?php if ($_options = $this->getOptionList()): ?>
 <dl class="item-options">
-    <?php foreach ($_options as $_option) : ?>
+    <?php foreach ($_options as $_option): ?>
     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
     <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
     <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
index a6d0df1623e3..29fda2ac6775 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
@@ -29,7 +29,7 @@
     <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
         <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
index 751d28973bb6..50c10156bccd 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
@@ -64,7 +64,7 @@
                         </div>
                     </li>
             <?php endfor ?>
-                    <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+                    <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
                     <li class="wide">
                         <label for="shipping:vat_id"><?php echo $this->__('VAT Number'); ?></label>
                         <div class="input-box">
diff --git a/app/design/frontend/rwd/default/template/customer/address/edit.phtml b/app/design/frontend/rwd/default/template/customer/address/edit.phtml
index 176e1f558c03..c74740b03b38 100644
--- a/app/design/frontend/rwd/default/template/customer/address/edit.phtml
+++ b/app/design/frontend/rwd/default/template/customer/address/edit.phtml
@@ -89,7 +89,7 @@
                 </div>
             </li>
         <?php endfor ?>
-            <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+            <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
             <li class="wide">
                 <label for="vat_id"><?php echo $this->__('VAT Number') ?></label>
                 <div class="input-box">
diff --git a/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml
index b90841307ae6..568ef3d3280d 100644
--- a/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml
@@ -44,7 +44,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
             </li>
         <?php endif ?>
 
-        <?php if ($this->helper('wishlist')->isAllowInCart() && $isVisibleProduct) : ?>
+        <?php if ($this->helper('wishlist')->isAllowInCart() && $isVisibleProduct): ?>
             <li>
                 <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo $this->__('Move to wishlist'); ?></a>
             </li>
@@ -68,7 +68,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
 
     <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
@@ -233,7 +233,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
             </li>
         <?php endif ?>
 
-        <?php if ($this->helper('wishlist')->isAllowInCart() && $isVisibleProduct) : ?>
+        <?php if ($this->helper('wishlist')->isAllowInCart() && $isVisibleProduct): ?>
             <li>
                 <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo $this->__('Move to wishlist'); ?></a>
             </li>
diff --git a/app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml
index f170250a608a..3c588e4346f3 100644
--- a/app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml
@@ -30,7 +30,7 @@
         <!-- item custom options -->
         <?php if ($_options = $this->getOptionList()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
             <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif ?>><?php echo $_formatedOptionValue['value'] ?>
diff --git a/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
index a75a25d42eaf..4c0f7660567c 100644
--- a/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
+++ b/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
@@ -29,7 +29,7 @@
 <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml b/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml
index e73699167270..0794d9809a16 100644
--- a/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml
+++ b/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml
@@ -105,7 +105,7 @@ $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()
                                         <p class="action availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                                     <?php endif ?>
                                     <ul class="add-to-links">
-                                        <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                                        <?php if ($this->helper('wishlist')->isAllow()): ?>
                                             <?php $_wishlistUrl = $this->helper('wishlist')->getAddUrlWithCustomParams($_product, array(), false); ?>
                                             <li><a href="#"
                                                    data-url="<?php echo $_wishlistUrl ?>"
@@ -116,7 +116,7 @@ $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()
                                                 </a>
                                             </li>
                                         <?php endif ?>
-                                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                                        <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                             <li>
                                                 <span class="separator">|</span>
                                                 <a href="#"
@@ -190,7 +190,7 @@ $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()
                                     <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                                 <?php endif ?>
                                 <ul class="add-to-links">
-                                    <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                                    <?php if ($this->helper('wishlist')->isAllow()): ?>
                                         <?php $_wishlistUrl = $this->helper('wishlist')->getAddUrlWithCustomParams($_product, array(), false); ?>
                                         <li>
                                             <a href="#"
@@ -202,7 +202,7 @@ $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()
                                             </a>
                                         </li>
                                     <?php endif ?>
-                                    <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                                    <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                         <li>
                                             <span class="separator">|</span>
                                             <a href="#"
diff --git a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml b/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml
index e92a6e26cd19..317027fbe109 100644
--- a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml
+++ b/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml
@@ -37,7 +37,7 @@
         </div>
         <div class="form-box">
             <?php echo $this->getMessagesBlock()->toHtml() ?>
-            <?php if (!$this->getHasException()) : ?>
+            <?php if (!$this->getHasException()): ?>
             <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
                 <?php echo $this->getBlockHtml('formkey'); ?>
                 <div class="fieldset" class="fieldset">
diff --git a/app/design/frontend/rwd/default/template/paypal/express/review/address.phtml b/app/design/frontend/rwd/default/template/paypal/express/review/address.phtml
index ad5d1892d84b..790e85d5d533 100644
--- a/app/design/frontend/rwd/default/template/paypal/express/review/address.phtml
+++ b/app/design/frontend/rwd/default/template/paypal/express/review/address.phtml
@@ -68,7 +68,7 @@
                     </div>
                 </li>
         <?php endfor ?>
-                <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+                <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
                 <li class="fields">
                     <div class="field">
                         <label for="<?php echo $prefix ?>:vat_id"><?php echo $this->__('VAT Number') ?></label>
diff --git a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
index 6b77ba5b4289..1c4deef8f1bd 100644
--- a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
+++ b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
@@ -74,7 +74,7 @@
                     </div>
                 </li>
         <?php endfor ?>
-                <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
+                <?php if ($this->helper('customer/address')->isVatAttributeVisible()): ?>
                 <li class="wide">
                     <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
                     <div class="input-box">
diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
index fc4404cdbc2c..9240cea96ec3 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
@@ -59,7 +59,7 @@
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                             <?php endif ?>
                             <ul class="add-to-links">
-                                <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                                <?php if ($this->helper('wishlist')->isAllow()): ?>
                                     <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_product, false); ?>
                                     <li>
                                         <a href="#"
@@ -71,7 +71,7 @@
                                         </a>
                                     </li>
                                 <?php endif ?>
-                                <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                                <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                     <li>
                                         <span class="separator">|</span>
                                         <a href="#"
diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
index 1d7b0e6e18c6..646d5886a3ea 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
@@ -46,7 +46,7 @@
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
                             <?php endif ?>
                             <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml
index 60188b3cb93e..ca7a8348e932 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml
@@ -63,7 +63,7 @@
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <?php $_wishlistUrl = $this->getAddToWishlistUrlCustom($_product, false); ?>
                                 <li>
                                     <a href="#"
@@ -75,7 +75,7 @@
                                     </a>
                                 </li>
                             <?php endif ?>
-                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)) : ?>
+                            <?php if ($_compareUrl = $this->getAddToCompareUrlCustom($_product, false)): ?>
                                 <li>
                                     <span class="separator">|</span>
                                     <a href="#"
diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml
index 0e5259718f78..0f9527af3787 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml
@@ -51,7 +51,7 @@
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
                         <ul class="add-to-links">
-                            <?php if ($this->helper('wishlist')->isAllow()) : ?>
+                            <?php if ($this->helper('wishlist')->isAllow()): ?>
                                 <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
                             <?php endif ?>
                             <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
diff --git a/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml
index d97a5790a199..fd4c49b40174 100644
--- a/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml
+++ b/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml
@@ -30,7 +30,7 @@
 <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
@@ -51,7 +51,7 @@
         </dl>
     <?php endif ?>
     <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-    <?php if ($addInfoBlock) : ?>
+    <?php if ($addInfoBlock): ?>
         <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
     <?php endif ?>
     <?php echo $this->escapeHtml($_item->getDescription()) ?>
diff --git a/app/design/frontend/rwd/default/template/sales/order/history.phtml b/app/design/frontend/rwd/default/template/sales/order/history.phtml
index d81238647396..d7b7e0856c71 100644
--- a/app/design/frontend/rwd/default/template/sales/order/history.phtml
+++ b/app/design/frontend/rwd/default/template/sales/order/history.phtml
@@ -61,7 +61,7 @@
             <td class="a-center view">
                 <span class="nobr"><a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo $this->__('View Order') ?></a>
                     <?php /*<span class="separator">|</span><a href="<?php echo $this->getTrackUrl($_order) ?>"><?php echo $this->__('Track Order') ?></a>&nbsp;*/ ?>
-                    <?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
+                    <?php if ($this->helper('sales/reorder')->canReorder($_order)): ?>
                     <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo $this->__('Reorder') ?></a>
                 <?php endif ?>
                 </span>
diff --git a/app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml
index b46d732e7ecb..d4d43e009a54 100644
--- a/app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml
+++ b/app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml
@@ -30,7 +30,7 @@
 <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
     <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
+            <?php foreach ($_options as $_option): ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$this->getPrintStatus()): ?>
                     <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
@@ -52,7 +52,7 @@
         </dl>
     <?php endif ?>
     <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-    <?php if ($addInfoBlock) : ?>
+    <?php if ($addInfoBlock): ?>
         <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
     <?php endif ?>
     <?php echo $this->escapeHtml($_item->getDescription()) ?>
diff --git a/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml
index 42c0a8e16105..90df75e1db84 100644
--- a/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml
+++ b/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml
@@ -29,7 +29,7 @@
     <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
         <?php if ($_options = $this->getItemOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
+        <?php foreach ($_options as $_option): ?>
             <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
             <?php if (!$this->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
diff --git a/app/design/frontend/rwd/default/template/sales/order/recent.phtml b/app/design/frontend/rwd/default/template/sales/order/recent.phtml
index ff609b8ce2da..4e8a769a3aee 100644
--- a/app/design/frontend/rwd/default/template/sales/order/recent.phtml
+++ b/app/design/frontend/rwd/default/template/sales/order/recent.phtml
@@ -59,7 +59,7 @@
                     <td class="a-center view">
                         <span class="nobr">
                         <a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo $this->__('View Order') ?></a>
-                        <?php if ($this->helper('sales/reorder')->canReorder($_order)) : ?>
+                        <?php if ($this->helper('sales/reorder')->canReorder($_order)): ?>
                             <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo $this->__('Reorder') ?></a>
                         <?php endif ?>
                         </span>
diff --git a/app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml b/app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml
index f7017ca718d9..57fbb3c8296a 100644
--- a/app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml
+++ b/app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml
@@ -26,7 +26,7 @@
 ?>
 <?php  $_order = $this->getOrder() ?>
 <p class="order-links">
-    <?php  if ($_order->getTracksCollection()->count()) : ?>
+    <?php  if ($_order->getTracksCollection()->count()): ?>
         <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track all shipment(s)')) ?>"><?php echo $this->__('Track all shipments') ?></a> <span class="separator">|</span>
     <?php endif ?>
     <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo $this->__('Print All Shipments') ?></a>
diff --git a/app/design/frontend/rwd/default/template/wishlist/sidebar.phtml b/app/design/frontend/rwd/default/template/wishlist/sidebar.phtml
index 1ba5c0a9e98a..adeb9a19c145 100644
--- a/app/design/frontend/rwd/default/template/wishlist/sidebar.phtml
+++ b/app/design/frontend/rwd/default/template/wishlist/sidebar.phtml
@@ -25,7 +25,7 @@
  */
 /* @var $this Mage_Wishlist_Block_Customer_Sidebar */
 ?>
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
 <div class="block block-wishlist">
     <div class="block-title">
         <strong><span><?php echo $this->getTitle(); ?></span></strong>
diff --git a/app/design/frontend/rwd/default/template/wishlist/view.phtml b/app/design/frontend/rwd/default/template/wishlist/view.phtml
index c2818a90bd11..faeed940dd88 100644
--- a/app/design/frontend/rwd/default/template/wishlist/view.phtml
+++ b/app/design/frontend/rwd/default/template/wishlist/view.phtml
@@ -25,7 +25,7 @@
  */
 /* @var $this Mage_Wishlist_Block_Customer_Wishlist */
 ?>
-<?php if ($this->helper('wishlist')->isAllow()) : ?>
+<?php if ($this->helper('wishlist')->isAllow()): ?>
     <div class="my-wishlist">
         <div class="page-title title-buttons">
             <?php if ($this->helper('wishlist')->isRssAllow() && $this->hasWishlistItems()): ?>