diff --git a/classes/AdminController.php b/classes/AdminController.php
index 3f217effe..446928c43 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -572,7 +572,7 @@ class AdminControllerCore extends Controller
 	 * @param $token
 	 * @return mixed
 	 */
-    public function processSave($token)
+	public function processSave($token)
 	{
 		if ($this->id_object)
 			return $this->processUpdate($token);
@@ -600,13 +600,13 @@ class AdminControllerCore extends Controller
 				$this->_errors[] = Tools::displayError('An error occurred while creating object.').
 					' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
 			}
-			 /* voluntary do affectation here */
+			/* voluntary do affectation here */
 			else if (($_POST[$this->identifier] = $object->id) && $this->postImage($object->id) && !count($this->_errors) && $this->_redirect)
 			{
 				$parent_id = (int)Tools::getValue('id_parent', 1);
 				$this->afterAdd($object);
 				$this->updateAssoShop($object->id);
-//							d($object);
+
 				// Save and stay on same form
 				if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
 					$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=3&update'.$this->table.'&token='.$token;
diff --git a/classes/Feature.php b/classes/Feature.php
index 5b614e0b1..cf556a8a3 100644
--- a/classes/Feature.php
+++ b/classes/Feature.php
@@ -37,6 +37,7 @@ class FeatureCore extends ObjectModel
 	public static $definition = array(
 		'table' => 'feature',
 		'primary' => 'id_feature',
+		'multilang' => true,
 		'fields' => array(
 			'position' => 	array('type' => self::TYPE_INT, 'validate' => 'isInt'),
 
diff --git a/classes/Hook.php b/classes/Hook.php
index aaacc458f..5d67ecf60 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -28,8 +28,8 @@
 class HookCore extends ObjectModel
 {
 	/** @var string Name and Title */
-	public 		$name;
-	public 		$title;
+	public $name;
+	public $title;
 
 	/**
 	 * @see ObjectModel::$definition
@@ -340,13 +340,6 @@ class HookCore extends ObjectModel
 			<a class="exclusive" href="#">Add a module</a></div>--><div id="'.$hook_name.'" class="dndHook" style="min-height:50px">' : '').$output.($live_edit ? '</div>' : '');
 	}
 
-
-
-
-
-
-
-
 	public static function updateOrderStatus($newOrderStatusId, $id_order)
 	{
 		$order = new Order((int)($id_order));
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 03c253c38..85ec3df3e 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -395,8 +395,8 @@ abstract class ObjectModelCore
 				foreach ($fields as &$field)
 				{
 					foreach (array_keys($field) AS $key)
-					 	if (!Validate::isTableOrIdentifier($key))
-			 				throw new PrestashopException('key '.$key.' is not table or identifier, ');
+						if (!Validate::isTableOrIdentifier($key))
+							throw new PrestashopException('key '.$key.' is not table or identifier, ');
 					$field[$this->def['primary']] = (int)$this->id;
 
 					if (isset($assos[$this->def['table'].'_lang']) && $assos[$this->def['table'].'_lang']['type'] == 'fk_shop')
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
index c42d51ff7..7c6f7d6ca 100644
--- a/controllers/admin/AdminFeaturesController.php
+++ b/controllers/admin/AdminFeaturesController.php
@@ -355,10 +355,10 @@ class AdminFeaturesControllerCore extends AdminController
 
 			if (Tools::isSubmit('deletefeature_value'))
 			{
-			 	if ($this->tabAccess['delete'] === '1')
-			 	{
-				 	if (Tools::getValue('id_feature_value'))
-				 	{
+				if ($this->tabAccess['delete'] === '1')
+				{
+					if (Tools::getValue('id_feature_value'))
+					{
 						$object = new FeatureValue((int)Tools::getValue('id_feature_value'));
 						if ($object->delete())
 							Tools::redirectAdmin(self::$currentIndex.'&conf=2'.'&token='.$this->token);
@@ -412,10 +412,10 @@ class AdminFeaturesControllerCore extends AdminController
 
 			if (Tools::getValue('submitDel'.$this->table))
 			{
-			 	if ($this->tabAccess['delete'] === '1')
-			 	{
-				 	if (isset($_POST[$this->table.'Box']))
-				 	{
+				if ($this->tabAccess['delete'] === '1')
+				{
+					if (isset($_POST[$this->table.'Box']))
+					{
 						$object = new $this->className();
 						if ($object->deleteSelection($_POST[$this->table.'Box']))
 							Tools::redirectAdmin(self::$currentIndex.'&conf=2'.'&token='.$this->token);