diff --git a/classes/pdf/HTMLTemplate.php b/classes/pdf/HTMLTemplate.php
index 5a5be9250..bbdda03bf 100755
--- a/classes/pdf/HTMLTemplate.php
+++ b/classes/pdf/HTMLTemplate.php
@@ -89,7 +89,7 @@ abstract class HTMLTemplateCore
         {
             $shop_address_obj = $this->shop->getAddress();
             if (isset($shop_address_obj) && $shop_address_obj instanceof Address)
-                $shop_address = AddressFormat::generateAddress($shop_address_obj, array(), ' - ', ' ');return $shop_address;
+                $shop_address = AddressFormat::generateAddress($shop_address_obj, array(), ' - ', ' ');
             return $shop_address;
         }
 
@@ -163,7 +163,7 @@ abstract class HTMLTemplateCore
 		if (@!include(_PS_THEME_DIR_.'pdf/lang/'.$iso.'.php'))
 			die('Cannot include PDF translation language file : '._PS_THEME_DIR_.'pdf/lang/'.$iso.'.php');
 
-		if (!isset($_LANGPDF) OR !is_array($_LANGPDF))
+		if (!isset($_LANGPDF) || !is_array($_LANGPDF))
 			return str_replace('"', '"', $string);
 		$key = md5(str_replace('\'', '\\\'', $string));
 		$str = (key_exists('PDF'.$key, $_LANGPDF) ? $_LANGPDF['PDF'.$key] : $string);
diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index 742ace2aa..76a5aa3d9 100755
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -87,8 +87,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
     {
 			$invoice_address = new Address((int)$this->order->id_address_invoice);
 			$tax_exempt = Configuration::get('VATNUMBER_MANAGEMENT')
-								AND !empty($invoiceAddress->vat_number)
-								AND $invoiceAddress->id_country != Configuration::get('VATNUMBER_COUNTRY');
+								&& !empty($invoiceAddress->vat_number)
+								&& $invoiceAddress->id_country != Configuration::get('VATNUMBER_COUNTRY');
 
 			$this->smarty->assign(array(
 				'tax_exempt' => $tax_exempt,
diff --git a/classes/pdf/HTMLTemplateOrderReturn.php b/classes/pdf/HTMLTemplateOrderReturn.php
index f4bfa9138..7357d1f07 100755
--- a/classes/pdf/HTMLTemplateOrderReturn.php
+++ b/classes/pdf/HTMLTemplateOrderReturn.php
@@ -41,7 +41,7 @@ class HTMLTemplateOrderReturnCore extends HTMLTemplate
 
 		// header informations
 		$this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang);
-		$this->title = HTMLTemplateOrderReturn::l('Order Return '.sprintf('%06d', $this->order_return->id); // TODO
+		$this->title = HTMLTemplateOrderReturn::l('Order Return '.sprintf('%06d', $this->order_return->id)); // TODO
 
 		// footer informations
 		$this->shop = new Shop((int)$this->order->id_shop);
diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php
index 9686a56f2..a78b808f6 100644
--- a/classes/tax/Tax.php
+++ b/classes/tax/Tax.php
@@ -194,7 +194,7 @@ class TaxCore extends ObjectModel
 	* @param id_address
 	* @return float $tax_rate
 	*/
-	public static function getProductEcotaxRate($id_address = NULL)
+	public static function getProductEcotaxRate($id_address = null)
 	{
 		$address = Address::initialize($id_address);
 
@@ -210,7 +210,7 @@ class TaxCore extends ObjectModel
 	* @param id_address
 	* @return float $tax_rate
 	*/
-	public static function getCarrierTaxRate($id_carrier, $id_address = NULL)
+	public static function getCarrierTaxRate($id_carrier, $id_address = null)
 	{
 		$address = Address::initialize($id_address);
 		$id_tax_rules = (int)Carrier::getIdTaxRulesGroupByIdCarrier((int)$id_carrier);
@@ -250,7 +250,7 @@ class TaxCore extends ObjectModel
 	 * @param integer $id_country
 	 * @return Tax
 	 */
-	public static function getProductTaxRate($id_product, $id_address = NULL)
+	public static function getProductTaxRate($id_product, $id_address = null)
 	{
 		$address = Address::initialize($id_address);
 		$id_tax_rules = (int)Product::getIdTaxRulesGroupByIdProduct($id_product);
diff --git a/classes/tax/TaxManagerModule.php b/classes/tax/TaxManagerModule.php
index 9ffbf2d03..f0118e26b 100644
--- a/classes/tax/TaxManagerModule.php
+++ b/classes/tax/TaxManagerModule.php
@@ -36,8 +36,7 @@ abstract class TaxManagerModuleCore extends Module
 
 	public function hookTaxManager($args)
 	{
-
-		$class_file =_PS_MODULE_DIR_.'/'.$this->name.'/'.$this->tax_manager_class.'.php';
+		$class_file = _PS_MODULE_DIR_.'/'.$this->name.'/'.$this->tax_manager_class.'.php';
 
 		if (!isset($this->tax_manager_class) || !file_exists($class_file))
 			die(Tools::displayError('Incorrect Tax Manager class ['.$this->tax_manager_class.']'));