diff --git a/ajax/backend/activate.php b/ajax/backend/activate.php
index ee99951cc6fdded279749a58c678f141630f1d1b..42dce9d9fc3e6d49d5620331a0bbae0cbe6ff372 100644
--- a/ajax/backend/activate.php
+++ b/ajax/backend/activate.php
@@ -12,10 +12,11 @@
  * @param integer $shippingId
  * @return array
  */
+
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_activate',
     function ($shippingId) {
-        $Shipping      = new Factory();
+        $Shipping = new Factory();
         $ShippingEntry = $Shipping->getChild($shippingId);
         $ShippingEntry->activate();
 
diff --git a/ajax/backend/articleList/getShippingPriceFactor.php b/ajax/backend/articleList/getShippingPriceFactor.php
index 8b42ca82d5efce8cf0b36811c37b747e75ae6023..398cefae49a02686a5e87e6bd0ff66c7abcd5d73 100644
--- a/ajax/backend/articleList/getShippingPriceFactor.php
+++ b/ajax/backend/articleList/getShippingPriceFactor.php
@@ -16,7 +16,7 @@
     'package_quiqqer_shipping_ajax_backend_articleList_getShippingPriceFactor',
     function ($shippingId) {
         $Shipping = Shipping::getInstance()->getShippingEntry($shippingId);
-        
+
         return [
             'title' => $Shipping->getTitle(),
             'price' => $Shipping->getPrice()
diff --git a/ajax/backend/create.php b/ajax/backend/create.php
index e5c5e8e112a0a4b34e1007d760e399d70ac26d1b..56e83e4c92ddb67313730a26133ee88a76e2072d 100644
--- a/ajax/backend/create.php
+++ b/ajax/backend/create.php
@@ -4,8 +4,8 @@
  * This file contains package_quiqqer_shipping_ajax_backend_create
  */
 
-use \QUI\ERP\Shipping\Types\Factory;
-use \QUI\ERP\Shipping\Shipping;
+use QUI\ERP\Shipping\Shipping;
+use QUI\ERP\Shipping\Types\Factory;
 
 /**
  * Create a new shipping method
@@ -17,7 +17,7 @@
     function ($shippingType) {
         $Type = Shipping::getInstance()->getShippingType($shippingType);
 
-        $Factory  = new Factory();
+        $Factory = new Factory();
         $Shipping = $Factory->createChild([
             'shipping_type' => $Type->getType()
         ]);
diff --git a/ajax/backend/deactivate.php b/ajax/backend/deactivate.php
index 47a959ba8257cd2af29c6144d4cb9919a12062d3..7058c828f2a8c5fe938dfccab4ee459a12b64665 100644
--- a/ajax/backend/deactivate.php
+++ b/ajax/backend/deactivate.php
@@ -4,7 +4,7 @@
  * This file contains package_quiqqer_shipping_ajax_backend_deactivate
  */
 
-use \QUI\ERP\Shipping\Types\Factory;
+use QUI\ERP\Shipping\Types\Factory;
 
 /**
  * Deactivate a shipping
@@ -15,7 +15,7 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_deactivate',
     function ($shippingId) {
-        $factory  = new Factory();
+        $factory = new Factory();
         $Shipping = $factory->getChild($shippingId);
         $Shipping->deactivate();
 
diff --git a/ajax/backend/getShippingList.php b/ajax/backend/getShippingList.php
index 1946fb56f7433efa16c9fcbd5d42b90c5719a262..b0a9d72c8f9d34a5b630f8f7aa93020a917555a4 100644
--- a/ajax/backend/getShippingList.php
+++ b/ajax/backend/getShippingList.php
@@ -16,7 +16,7 @@
     'package_quiqqer_shipping_ajax_backend_getShippingList',
     function () {
         $shippingEntries = Shipping::getInstance()->getShippingList();
-        $result          = [];
+        $result = [];
 
         foreach ($shippingEntries as $ShippingEntry) {
             /* @var $ShippingEntry ShippingEntry */
@@ -25,7 +25,7 @@ function () {
 
         $current = QUI::getLocale()->getCurrent();
 
-        \usort($result, function ($a, $b) use ($current) {
+        usort($result, function ($a, $b) use ($current) {
             $aTitle = $a['title'][$current];
             $bTitle = $b['title'][$current];
 
diff --git a/ajax/backend/rules/create.php b/ajax/backend/rules/create.php
index fa9677fc6613ffc5e7db9442ff7de91c63c5fd8e..a621ad763dbca3fbc3553a5f13b6d40158a0dc62 100644
--- a/ajax/backend/rules/create.php
+++ b/ajax/backend/rules/create.php
@@ -4,7 +4,7 @@
  * This file contains package_quiqqer_shipping_ajax_backend_create
  */
 
-use \QUI\ERP\Shipping\Rules\Factory;
+use QUI\ERP\Shipping\Rules\Factory;
 
 
 /**
@@ -15,9 +15,9 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_rules_create',
     function ($rules) {
-        $rules   = \json_decode($rules, true);
+        $rules = json_decode($rules, true);
         $Factory = new Factory();
-        $Rule    = $Factory->createChild($rules);
+        $Rule = $Factory->createChild($rules);
 
         return $Rule->getId();
     },
diff --git a/ajax/backend/rules/delete.php b/ajax/backend/rules/delete.php
index 6b3e3c2924a1082f0178841be8d7d611defaaa3a..5ae2d9cd47c295b0acf29ffd2aea1117748656e8 100644
--- a/ajax/backend/rules/delete.php
+++ b/ajax/backend/rules/delete.php
@@ -5,7 +5,6 @@
  */
 
 use QUI\ERP\Shipping\Rules\Factory;
-use QUI\ExceptionStack;
 
 /**
  * Delete the shipping rule(s)
@@ -15,10 +14,10 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_rules_delete',
     function ($ruleIds) {
-        $ruleIds = \json_decode($ruleIds, true);
+        $ruleIds = json_decode($ruleIds, true);
         $Factory = new Factory();
 
-        if (!\is_array($ruleIds)) {
+        if (!is_array($ruleIds)) {
             $ruleIds = [$ruleIds];
         }
 
diff --git a/ajax/backend/rules/getList.php b/ajax/backend/rules/getList.php
index b477d8bd561f49d2443d7c42e8429253f51e0d46..c0a319dbb5ba9b8a948d612388b9c079ab064acb 100644
--- a/ajax/backend/rules/getList.php
+++ b/ajax/backend/rules/getList.php
@@ -14,7 +14,7 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_rules_getList',
     function ($options) {
-        $options = \json_decode($options, true);
+        $options = json_decode($options, true);
 
         if (!is_array($options)) {
             $options = [];
@@ -44,8 +44,8 @@ function ($options) {
         }
 
         $Factory = QUI\ERP\Shipping\Rules\Factory::getInstance();
-        $Grid    = new Grid();
-        $query   = $Grid->parseDBParams($options);
+        $Grid = new Grid();
+        $query = $Grid->parseDBParams($options);
 
         if (!isset($query['order'])) {
             $query['order'] = 'priority DESC';
@@ -68,8 +68,8 @@ function ($options) {
         $count = $Factory->countChildren($query);
 
         return [
-            'data'  => $result,
-            'page'  => (int)$options['page'],
+            'data' => $result,
+            'page' => (int)$options['page'],
             'total' => $count
         ];
     },
diff --git a/ajax/backend/rules/getRules.php b/ajax/backend/rules/getRules.php
index 272662e3247d1968c275499bdb495f46a2f8ba30..0d0b73421c014ce337f141f6d86dba286275a513 100644
--- a/ajax/backend/rules/getRules.php
+++ b/ajax/backend/rules/getRules.php
@@ -12,12 +12,12 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_rules_getRules',
     function ($ruleIds) {
-        $ruleIds = \json_decode($ruleIds, true);
-        $Rules   = QUI\ERP\Shipping\Rules\Factory::getInstance();
+        $ruleIds = json_decode($ruleIds, true);
+        $Rules = QUI\ERP\Shipping\Rules\Factory::getInstance();
 
         $result = [];
 
-        if (!\is_array($ruleIds)) {
+        if (!is_array($ruleIds)) {
             $ruleIds = [];
         }
 
@@ -30,7 +30,7 @@ function ($ruleIds) {
         }
 
         // sort by priority
-        \usort($result, function ($a, $b) {
+        usort($result, function ($a, $b) {
             if (!isset($a['priority'])) {
                 $a['priority'] = 0;
             }
diff --git a/ajax/backend/rules/settings/getUnitFieldSetting.php b/ajax/backend/rules/settings/getUnitFieldSetting.php
index d2512c42b8ab01c52ade40ba52a22cb55333c429..78e0b87e3a9e4a6f4f5fe3bb8201b28cd0b3ca9e 100644
--- a/ajax/backend/rules/settings/getUnitFieldSetting.php
+++ b/ajax/backend/rules/settings/getUnitFieldSetting.php
@@ -14,9 +14,9 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_rules_settings_getUnitFieldSetting',
     function () {
-        $result   = [];
+        $result = [];
         $Shipping = \QUI\ERP\Shipping\Shipping::getInstance();
-        $ids      = $Shipping->getShippingRuleUnitFieldIds();
+        $ids = $Shipping->getShippingRuleUnitFieldIds();
 
         foreach ($ids as $id) {
             try {
diff --git a/ajax/backend/rules/update.php b/ajax/backend/rules/update.php
index 41fac83db0ad6d0f3bae51def172ee7b427f9a25..c0fdacab0578c893aec4aff4c751396fda51eb58 100644
--- a/ajax/backend/rules/update.php
+++ b/ajax/backend/rules/update.php
@@ -4,7 +4,7 @@
  * This file contains package_quiqqer_shipping_ajax_backend_rules_update
  */
 
-use \QUI\ERP\Shipping\Rules\Factory;
+use QUI\ERP\Shipping\Rules\Factory;
 
 /**
  * Update a shipping method
@@ -14,7 +14,7 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_rules_update',
     function ($ruleId, $data) {
-        $data    = \json_decode($data, true);
+        $data = json_decode($data, true);
         $Factory = new Factory();
 
         /* @var $Rule QUI\ERP\Shipping\Rules\ShippingRule */
diff --git a/ajax/backend/shippingStatus/getNotificationText.php b/ajax/backend/shippingStatus/getNotificationText.php
index 0481fbabc4924a7bfd81e9f3d670e12baf25c6a9..1fbd635d97682ba06458e6392e03873d6c4ea47c 100644
--- a/ajax/backend/shippingStatus/getNotificationText.php
+++ b/ajax/backend/shippingStatus/getNotificationText.php
@@ -4,8 +4,8 @@
  * This file contains package_quiqqer_shipping_ajax_backend_shippingStatus_getNotificationText
  */
 
-use QUI\ERP\Shipping\ShippingStatus\Handler;
 use QUI\ERP\Order\Handler as OrderHandler;
+use QUI\ERP\Shipping\ShippingStatus\Handler;
 
 /**
  * Get status change notification text for a specific order
diff --git a/ajax/backend/shippingStatus/list.php b/ajax/backend/shippingStatus/list.php
index 0c2c0baaaa5bfb6340ee311682d97b6dabbae3d3..9f8d1fb43dd2c3b912017e9a28dd60f22ec277de 100644
--- a/ajax/backend/shippingStatus/list.php
+++ b/ajax/backend/shippingStatus/list.php
@@ -14,16 +14,16 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_shippingStatus_list',
     function () {
-        $Grid    = new QUI\Utils\Grid();
+        $Grid = new QUI\Utils\Grid();
         $Handler = Handler::getInstance();
 
-        $list   = $Handler->getShippingStatusList();
+        $list = $Handler->getShippingStatusList();
         $result = \array_map(function ($Status) {
             /* @var $Status \QUI\ERP\Shipping\ShippingStatus\Status */
             return $Status->toArray(QUI::getLocale());
         }, $list);
 
-        \usort($result, function ($a, $b) {
+        usort($result, function ($a, $b) {
             if ($a['id'] == $b['id']) {
                 return 0;
             }
diff --git a/ajax/backend/shippingStatus/update.php b/ajax/backend/shippingStatus/update.php
index 1d447c8679508189e03a52496a5ac83e4091609f..43ba7dde635b9b3838150571b2ee65f7c0538db2 100644
--- a/ajax/backend/shippingStatus/update.php
+++ b/ajax/backend/shippingStatus/update.php
@@ -18,7 +18,7 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_shippingStatus_update',
     function ($id, $color, $title, $notification) {
-        $id      = (int)$id;
+        $id = (int)$id;
         $Handler = Handler::getInstance();
 
         $Handler->updateShippingStatus(
diff --git a/ajax/backend/update.php b/ajax/backend/update.php
index 8eba454937a513dfb3d402b2688ec0da8c57c8c1..eb5f37138b86d20bbc9c826ca8e44a1b26c5269f 100644
--- a/ajax/backend/update.php
+++ b/ajax/backend/update.php
@@ -15,7 +15,7 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_shipping_ajax_backend_update',
     function ($shippingId, $data) {
-        $Factory       = new Factory();
+        $Factory = new Factory();
         $ShippingEntry = $Factory->getChild($shippingId);
 
         $data = \json_decode($data, true);
diff --git a/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php b/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php
index fb5cecf68bdaadfc8077b620d8532462ab3b0c22..9959f5b73510d99bc502d9c981141447e55f863c 100644
--- a/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php
+++ b/src/QUI/ERP/Shipping/Api/AbstractShippingEntry.php
@@ -102,9 +102,9 @@ abstract public function getWorkingTitle();
      */
     public function getIcon()
     {
-        return QUI\ERP\Shipping\Shipping::getInstance()->getHost().
-               URL_OPT_DIR
-               .'quiqqer/shipping/bin/images/shipping/default.png';
+        return QUI\ERP\Shipping\Shipping::getInstance()->getHost() .
+            URL_OPT_DIR
+            . 'quiqqer/shipping/bin/images/shipping/default.png';
     }
 
     /**
@@ -115,8 +115,8 @@ public function getIcon()
     public function toArray()
     {
         return [
-            'name'        => $this->getName(),
-            'title'       => $this->getTitle(),
+            'name' => $this->getName(),
+            'title' => $this->getTitle(),
             'description' => $this->getDescription()
         ];
     }
diff --git a/src/QUI/ERP/Shipping/Api/AbstractShippingProvider.php b/src/QUI/ERP/Shipping/Api/AbstractShippingProvider.php
index 79c2e98328ca3682759a7bb1406a4b1d64bfea29..3acc49557329d8eea0ebbc3e5b86dc1450b86ea8 100644
--- a/src/QUI/ERP/Shipping/Api/AbstractShippingProvider.php
+++ b/src/QUI/ERP/Shipping/Api/AbstractShippingProvider.php
@@ -6,8 +6,6 @@
 
 namespace QUI\ERP\Shipping\Api;
 
-use QUI;
-
 /**
  * Shipping provider
  *
diff --git a/src/QUI/ERP/Shipping/Api/AbstractShippingType.php b/src/QUI/ERP/Shipping/Api/AbstractShippingType.php
index 80fdd63821929e12974d852899c6754c39beb903..5ab7e534d6178ac5779f65ffe94befe75462409b 100644
--- a/src/QUI/ERP/Shipping/Api/AbstractShippingType.php
+++ b/src/QUI/ERP/Shipping/Api/AbstractShippingType.php
@@ -36,7 +36,7 @@ public function toArray($Locale = null)
 
         return [
             'title' => $this->getTitle($Locale),
-            'type'  => $this->getType()
+            'type' => $this->getType()
         ];
     }
 
diff --git a/src/QUI/ERP/Shipping/Methods/Digital/ShippingType.php b/src/QUI/ERP/Shipping/Methods/Digital/ShippingType.php
index 2b7d657e303d9be11bfd15c63e68f92d709e4717..dbdde94642aad3dda01a065e27ea82084073ca04 100644
--- a/src/QUI/ERP/Shipping/Methods/Digital/ShippingType.php
+++ b/src/QUI/ERP/Shipping/Methods/Digital/ShippingType.php
@@ -5,8 +5,8 @@
 use QUI;
 use QUI\ERP\Areas\Utils as AreaUtils;
 use QUI\ERP\Products\Handler\Products;
-use QUI\ERP\Shipping\Debug;
 use QUI\ERP\Products\Product\Types\DigitalProduct;
+use QUI\ERP\Shipping\Debug;
 
 /**
  * Class DigitalType
@@ -33,9 +33,9 @@ public function getTitle($Locale = null)
      */
     public function getIcon()
     {
-        return QUI\ERP\Shipping\Shipping::getInstance()->getHost().
-               URL_OPT_DIR
-               .'quiqqer/shipping/bin/images/shipping/download.png';
+        return QUI\ERP\Shipping\Shipping::getInstance()->getHost() .
+            URL_OPT_DIR
+            . 'quiqqer/shipping/bin/images/shipping/download.png';
     }
 
     /**
@@ -72,7 +72,7 @@ public function canUsedInOrder(
                 if (!($Product instanceof DigitalProduct)) {
                     Debug::addLog(
                         "{$this->getTitle()} :: {$ShippingEntry->getTitle()} :: contains at least one NON-DIGITAL"
-                        ." product that must be shipped physically."
+                        . " product that must be shipped physically."
                     );
 
                     return false;
@@ -83,7 +83,7 @@ public function canUsedInOrder(
         }
 
         // Check restriction to certain products / product categories
-        $articles   = $ShippingEntry->getAttribute('articles');
+        $articles = $ShippingEntry->getAttribute('articles');
         $categories = $ShippingEntry->getAttribute('categories');
 
         $toInt = function ($article) {
@@ -109,7 +109,7 @@ public function canUsedInOrder(
             return true;
         }
 
-        $ArticleList   = $Order->getArticles();
+        $ArticleList = $Order->getArticles();
         $orderArticles = $ArticleList->getArticles();
 
         foreach ($orderArticles as $Article) {
@@ -117,13 +117,15 @@ public function canUsedInOrder(
                 $productId = $Article->getId();
 
                 if (!empty($articles) && \in_array($productId, $articles)) {
-                    Debug::addLog("{$this->getTitle()} :: {$ShippingEntry->getTitle()} :: product {$productId} is in allowed list [ok]");
+                    Debug::addLog(
+                        "{$this->getTitle()} :: {$ShippingEntry->getTitle()} :: product {$productId} is in allowed list [ok]"
+                    );
 
                     return true;
                 }
 
                 if (\is_array($categories)) {
-                    $Product           = QUI\ERP\Products\Handler\Products::getProduct($productId);
+                    $Product = QUI\ERP\Products\Handler\Products::getProduct($productId);
                     $articleCategories = $Product->getCategories();
 
                     /* @var $Category QUI\ERP\Products\Category\Category */
@@ -131,7 +133,9 @@ public function canUsedInOrder(
                         $categoryId = $Category->getId();
 
                         if (\in_array($categoryId, $categories)) {
-                            Debug::addLog("{$this->getTitle()} :: {$ShippingEntry->getTitle()} :: category {$categoryId} is in allowed list [ok]");
+                            Debug::addLog(
+                                "{$this->getTitle()} :: {$ShippingEntry->getTitle()} :: category {$categoryId} is in allowed list [ok]"
+                            );
 
                             return true;
                         }
@@ -173,7 +177,7 @@ public function canUsedBy(
 
         // assignment
         $userGroupValue = $ShippingEntry->getAttribute('user_groups');
-        $areasValue     = $ShippingEntry->getAttribute('areas');
+        $areasValue = $ShippingEntry->getAttribute('areas');
 
         // if groups and areas are empty, everybody is allowed
         if (empty($userGroupValue) && empty($areasValue)) {
@@ -202,7 +206,7 @@ public function canUsedBy(
             $ShippingEntry->getAttribute('user_groups')
         );
 
-        $discountUsers  = $userGroups['users'];
+        $discountUsers = $userGroups['users'];
         $discountGroups = $userGroups['groups'];
 
         if (empty($discountUsers) && empty($discountGroups)) {
diff --git a/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php b/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php
index e9c10273ff46af883d737faa2272fee57887b622..3096d542624d5d67fa28c9cc5fb088df13914ccc 100644
--- a/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php
+++ b/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php
@@ -101,7 +101,7 @@ public function canUsedInOrder(
         }
 
         // assignment
-        $articles   = $ShippingEntry->getAttribute('articles');
+        $articles = $ShippingEntry->getAttribute('articles');
         $categories = $ShippingEntry->getAttribute('categories');
 
         $toInt = function ($article) {
@@ -127,7 +127,7 @@ public function canUsedInOrder(
             return true;
         }
 
-        $ArticleList   = $Order->getArticles();
+        $ArticleList = $Order->getArticles();
         $orderArticles = $ArticleList->getArticles();
 
         foreach ($orderArticles as $Article) {
@@ -143,7 +143,7 @@ public function canUsedInOrder(
                 }
 
                 if (is_array($categories)) {
-                    $Product           = QUI\ERP\Products\Handler\Products::getProduct($productId);
+                    $Product = QUI\ERP\Products\Handler\Products::getProduct($productId);
                     $articleCategories = $Product->getCategories();
 
                     /* @var $Category QUI\ERP\Products\Category\Category */
@@ -195,7 +195,7 @@ public function canUsedBy(
 
         // assignment
         $userGroupValue = $ShippingEntry->getAttribute('user_groups');
-        $areasValue     = $ShippingEntry->getAttribute('areas');
+        $areasValue = $ShippingEntry->getAttribute('areas');
 
         // if groups and areas are empty, everybody is allowed
         if (empty($userGroupValue) && empty($areasValue)) {
@@ -224,7 +224,7 @@ public function canUsedBy(
             $ShippingEntry->getAttribute('user_groups')
         );
 
-        $discountUsers  = $userGroups['users'];
+        $discountUsers = $userGroups['users'];
         $discountGroups = $userGroups['groups'];
 
         if (empty($discountUsers) && empty($discountGroups)) {
diff --git a/src/QUI/ERP/Shipping/Methods/Standard/___Shipping.php b/src/QUI/ERP/Shipping/Methods/Standard/___Shipping.php
deleted file mode 100644
index c68f98aaffbd7bdae8eebf3776c4c4114ef30a68..0000000000000000000000000000000000000000
--- a/src/QUI/ERP/Shipping/Methods/Standard/___Shipping.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This file contains QUI\ERP\Shipping\Methods\Standard\Shipping
- */
-
-namespace QUI\ERP\Shipping\Methods\Standard;
-
-use QUI;
-use QUI\ERP\Shipping\Shipping as ShippingHandler;
-
-/**
- * Class Shipping
- *
- * @package QUI\ERP\Shipping\Methods\Standard\Shipping
- */
-class Shipping extends QUI\ERP\Shipping\Api\AbstractShippingEntry
-{
-    /**
-     * @return array|string
-     */
-    public function getTitle()
-    {
-        return $this->getLocale()->get('quiqqer/shipping', 'shipping.standard.title');
-    }
-
-    /**
-     * @return array|string
-     */
-    public function getWorkingTitle()
-    {
-        return $this->getLocale()->get('quiqqer/shipping', 'shipping.standard.workingTitle');
-    }
-
-    /**
-     * @return array|string
-     */
-    public function getDescription()
-    {
-        return $this->getLocale()->get('quiqqer/shipping', 'shipping.standard.description');
-    }
-
-    /**
-     * Return the shipping icon (the URL path)
-     * Can be overwritten
-     *
-     * @return string
-     */
-    public function getIcon()
-    {
-        return ShippingHandler::getInstance()->getHost().
-               URL_OPT_DIR.
-               'quiqqer/shipping/bin/shipping/standard.png';
-    }
-}
diff --git a/src/QUI/ERP/Shipping/Order/ShippingAddress.php b/src/QUI/ERP/Shipping/Order/ShippingAddress.php
index 9bedfb5613530c05c2b9129186c91acc077962a6..ee81fade25b01a9842412e44e9d431e3b75579fa 100644
--- a/src/QUI/ERP/Shipping/Order/ShippingAddress.php
+++ b/src/QUI/ERP/Shipping/Order/ShippingAddress.php
@@ -24,7 +24,7 @@ public function __construct($attributes = [])
     {
         parent::__construct($attributes);
 
-        $this->addCSSFile(\dirname(__FILE__).'/ShippingAddress.css');
+        $this->addCSSFile(\dirname(__FILE__) . '/ShippingAddress.css');
         $this->addCSSClass('quiqqer-shipping-address');
     }
 
@@ -54,7 +54,7 @@ public function getBody()
 
         try {
             $Project = QUI::getRewrite()->getProject();
-            $sites   = $Project->getSites([
+            $sites = $Project->getSites([
                 'where' => [
                     'type' => 'quiqqer/frontend-users:types/profile'
                 ],
@@ -63,7 +63,7 @@ public function getBody()
 
             if (isset($sites[0])) {
                 /* @var $Profile QUI\Projects\Site */
-                $Profile     = $sites[0];
+                $Profile = $sites[0];
                 $profileLink = $Profile->getUrlRewritten();
                 $profileLink .= '/user/address';
             }
@@ -72,9 +72,9 @@ public function getBody()
         }
 
         // current address
-        $currentAddress  = '';
+        $currentAddress = '';
         $ShippingAddress = null;
-        
+
         $Shipping = QUI\ERP\Shipping\Shipping::getInstance()->getShippingByObject($Order);
 
         if ($Shipping) {
@@ -88,11 +88,11 @@ public function getBody()
         }
 
         $Engine->assign([
-            'addressList'    => $addressList,
-            'profileLink'    => $profileLink,
+            'addressList' => $addressList,
+            'profileLink' => $profileLink,
             'currentAddress' => $currentAddress
         ]);
 
-        return $Engine->fetch(\dirname(__FILE__).'/ShippingAddress.html');
+        return $Engine->fetch(\dirname(__FILE__) . '/ShippingAddress.html');
     }
 }