diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6d2ae088f..300cf55373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -157,6 +157,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - [PR-777](https://github.com/OXID-eSales/oxideshop_ce/pull/777)
     - [PR-774](https://github.com/OXID-eSales/oxideshop_ce/pull/774)
     - [PR-773](https://github.com/OXID-eSales/oxideshop_ce/pull/773)
+    - [PR-775](https://github.com/OXID-eSales/oxideshop_ce/pull/775)
     
 ### Security
 
diff --git a/source/Application/Component/NewsComponent.php b/source/Application/Component/NewsComponent.php
index 4397ebe7a9..974741cd5c 100644
--- a/source/Application/Component/NewsComponent.php
+++ b/source/Application/Component/NewsComponent.php
@@ -14,7 +14,6 @@
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a
  *                                         module in v6.0.0
- *
  */
 class NewsComponent extends \OxidEsales\Eshop\Core\Controller\BaseController
 {
diff --git a/source/Application/Controller/Admin/AdminDetailsController.php b/source/Application/Controller/Admin/AdminDetailsController.php
index dd9d3b1b78..17242dbf09 100644
--- a/source/Application/Controller/Admin/AdminDetailsController.php
+++ b/source/Application/Controller/Admin/AdminDetailsController.php
@@ -351,7 +351,6 @@ protected function _resetCounts($aIds)
      *                                             else
      * @param string            $field             The input field we want to edit
      * @param string            $stylesheet        The name of the CSS file
-     *
      */
     protected function configureTextEditorHandler(
         TextEditorHandler $textEditorHandler,
diff --git a/source/Application/Controller/Admin/AdminNews.php b/source/Application/Controller/Admin/AdminNews.php
index 785c46f8a4..7292a791bb 100644
--- a/source/Application/Controller/Admin/AdminNews.php
+++ b/source/Application/Controller/Admin/AdminNews.php
@@ -14,7 +14,6 @@
  * Admin Menu: Customer Info -> News.
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a module in v6.0.0
- *
  */
 class AdminNews extends \OxidEsales\Eshop\Application\Controller\Admin\AdminController
 {
diff --git a/source/Application/Controller/Admin/DiagnosticsMain.php b/source/Application/Controller/Admin/DiagnosticsMain.php
index 506782bbc9..e8e7e00fd5 100644
--- a/source/Application/Controller/Admin/DiagnosticsMain.php
+++ b/source/Application/Controller/Admin/DiagnosticsMain.php
@@ -83,7 +83,6 @@ protected function _getErrorMessage()
 
     /**
      * Calls parent constructor and initializes checker object
-     *
      */
     public function __construct()
     {
diff --git a/source/Application/Controller/Admin/DiscountArticlesAjax.php b/source/Application/Controller/Admin/DiscountArticlesAjax.php
index 0fccdb2a9b..e9436abcea 100644
--- a/source/Application/Controller/Admin/DiscountArticlesAjax.php
+++ b/source/Application/Controller/Admin/DiscountArticlesAjax.php
@@ -15,7 +15,6 @@
  */
 class DiscountArticlesAjax extends \OxidEsales\Eshop\Application\Controller\Admin\ListComponentAjax
 {
-    /**  */
     const NEW_DISCOUNT_LIST_ID = "-1";
 
     /**
diff --git a/source/Application/Controller/Admin/ModuleList.php b/source/Application/Controller/Admin/ModuleList.php
index 8d42dbf55b..124b8e37ef 100644
--- a/source/Application/Controller/Admin/ModuleList.php
+++ b/source/Application/Controller/Admin/ModuleList.php
@@ -21,7 +21,6 @@ class ModuleList extends \OxidEsales\Eshop\Application\Controller\Admin\AdminLis
 {
     /**
      * @var array Loaded modules array
-     *
      */
     protected $_aModules = [];
 
diff --git a/source/Application/Controller/Admin/NewsMainAjax.php b/source/Application/Controller/Admin/NewsMainAjax.php
index c836a94b0b..5c50076b14 100644
--- a/source/Application/Controller/Admin/NewsMainAjax.php
+++ b/source/Application/Controller/Admin/NewsMainAjax.php
@@ -14,7 +14,6 @@
  * Class manages news user groups rights
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a module in v6.0.0
- *
  */
 class NewsMainAjax extends \OxidEsales\Eshop\Application\Controller\Admin\ListComponentAjax
 {
diff --git a/source/Application/Controller/Admin/ShopRdfa.php b/source/Application/Controller/Admin/ShopRdfa.php
index 1e813f5b91..547cac7e5f 100644
--- a/source/Application/Controller/Admin/ShopRdfa.php
+++ b/source/Application/Controller/Admin/ShopRdfa.php
@@ -14,7 +14,6 @@
  * Admin shop system RDFa manager.
  * Collects shop system settings, updates it on user submit, etc.
  * Admin Menu: Main Menu -> Core Settings -> RDFa.
- *
  */
 class ShopRdfa extends \OxidEsales\Eshop\Application\Controller\Admin\ShopConfiguration
 {
diff --git a/source/Application/Controller/Admin/VoucherSerieGenerate.php b/source/Application/Controller/Admin/VoucherSerieGenerate.php
index 3077e8b32d..c766d4d4c7 100644
--- a/source/Application/Controller/Admin/VoucherSerieGenerate.php
+++ b/source/Application/Controller/Admin/VoucherSerieGenerate.php
@@ -12,7 +12,6 @@
 
 /**
  * Voucher Serie generator class
- *
  */
 class VoucherSerieGenerate extends \OxidEsales\Eshop\Application\Controller\Admin\VoucherSerieMain
 {
diff --git a/source/Application/Controller/DownloadController.php b/source/Application/Controller/DownloadController.php
index f60546ac03..bcc0ea0c80 100644
--- a/source/Application/Controller/DownloadController.php
+++ b/source/Application/Controller/DownloadController.php
@@ -14,7 +14,6 @@
 
 /**
  * Article file download page.
- *
  */
 class DownloadController extends \OxidEsales\Eshop\Application\Controller\FrontendController
 {
diff --git a/source/Application/Controller/NewsController.php b/source/Application/Controller/NewsController.php
index 8106b2093e..bada6cc536 100644
--- a/source/Application/Controller/NewsController.php
+++ b/source/Application/Controller/NewsController.php
@@ -15,7 +15,6 @@
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to
  *                                         a module in v6.0.0
- *
  */
 class NewsController extends \OxidEsales\Eshop\Application\Controller\FrontendController
 {
diff --git a/source/Application/Controller/WishListController.php b/source/Application/Controller/WishListController.php
index 213a3f364b..5910e3e357 100644
--- a/source/Application/Controller/WishListController.php
+++ b/source/Application/Controller/WishListController.php
@@ -116,7 +116,6 @@ public function getWishList()
      *
      * Template variables:
      * <b>wish_result</b>, <b>search</b>
-     *
      */
     public function searchForWishList()
     {
diff --git a/source/Application/Model/ActionList.php b/source/Application/Model/ActionList.php
index 6c18c1f0f7..8fe495d171 100644
--- a/source/Application/Model/ActionList.php
+++ b/source/Application/Model/ActionList.php
@@ -12,7 +12,6 @@
 
 /**
  * Promotion List manager.
- *
  */
 class ActionList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Actions.php b/source/Application/Model/Actions.php
index c321cbb532..0999276661 100644
--- a/source/Application/Model/Actions.php
+++ b/source/Application/Model/Actions.php
@@ -16,7 +16,6 @@
 
 /**
  * Article actions manager. Collects and keeps actions of chosen article.
- *
  */
 class Actions extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/AmountPriceList.php b/source/Application/Model/AmountPriceList.php
index c597d0a22f..cc7cebfc39 100644
--- a/source/Application/Model/AmountPriceList.php
+++ b/source/Application/Model/AmountPriceList.php
@@ -11,7 +11,6 @@
 
 /**
  * Article amount price list
- *
  */
 class AmountPriceList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Article.php b/source/Application/Model/Article.php
index 02a1cc0a74..ab63750bd6 100644
--- a/source/Application/Model/Article.php
+++ b/source/Application/Model/Article.php
@@ -27,7 +27,6 @@
  * Article manager.
  * Creates fully detailed article object, with such information as VAT,
  * discounts, etc.
- *
  */
 class Article extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Application\Model\Contract\ArticleInterface, \OxidEsales\Eshop\Core\Contract\IUrl
 {
diff --git a/source/Application/Model/ArticleList.php b/source/Application/Model/ArticleList.php
index 3c3d9782e1..d43dc3b9ec 100644
--- a/source/Application/Model/ArticleList.php
+++ b/source/Application/Model/ArticleList.php
@@ -18,7 +18,6 @@
 /**
  * Article list manager.
  * Collects list of article according to collection rules (categories, etc.).
- *
  */
 class ArticleList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Attribute.php b/source/Application/Model/Attribute.php
index f9f5b86732..034d0cabda 100644
--- a/source/Application/Model/Attribute.php
+++ b/source/Application/Model/Attribute.php
@@ -15,7 +15,6 @@
 /**
  * Article attributes manager.
  * Collects and keeps attributes of chosen article.
- *
  */
 class Attribute extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/AttributeList.php b/source/Application/Model/AttributeList.php
index ca0cc9b47b..1f26f8538d 100644
--- a/source/Application/Model/AttributeList.php
+++ b/source/Application/Model/AttributeList.php
@@ -13,7 +13,6 @@
 
 /**
  * Attribute list manager.
- *
  */
 class AttributeList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Basket.php b/source/Application/Model/Basket.php
index 6c174215f8..d440de6122 100644
--- a/source/Application/Model/Basket.php
+++ b/source/Application/Model/Basket.php
@@ -11,7 +11,6 @@
 
 /**
  * Basket manager
- *
  */
 class Basket extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/BasketItem.php b/source/Application/Model/BasketItem.php
index 2faa63f0c8..1c35425871 100644
--- a/source/Application/Model/BasketItem.php
+++ b/source/Application/Model/BasketItem.php
@@ -15,7 +15,6 @@
 
 /**
  * UserBasketItem class, responsible for storing most important fields
- *
  */
 class BasketItem extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/BasketReservation.php b/source/Application/Model/BasketReservation.php
index 29de84b622..4263de38ad 100644
--- a/source/Application/Model/BasketReservation.php
+++ b/source/Application/Model/BasketReservation.php
@@ -17,7 +17,6 @@
 
 /**
  * Basket reservations handler class
- *
  */
 class BasketReservation extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/Category.php b/source/Application/Model/Category.php
index b05df6ad10..559eb36b04 100644
--- a/source/Application/Model/Category.php
+++ b/source/Application/Model/Category.php
@@ -15,7 +15,6 @@
  * Category manager.
  * Collects category information (articles, etc.), performs insertion/deletion
  * of categories nodes. By recursion methods are set structure of category.
- *
  */
 class Category extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Core\Contract\IUrl
 {
diff --git a/source/Application/Model/CategoryList.php b/source/Application/Model/CategoryList.php
index e78278c426..dde402943a 100644
--- a/source/Application/Model/CategoryList.php
+++ b/source/Application/Model/CategoryList.php
@@ -14,7 +14,6 @@
  * Category list manager.
  * Collects available categories, performs some SQL queries to create category
  * list structure.
- *
  */
 class CategoryList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Content.php b/source/Application/Model/Content.php
index 8ac8d065d2..aa701b8473 100644
--- a/source/Application/Model/Content.php
+++ b/source/Application/Model/Content.php
@@ -14,7 +14,6 @@
 /**
  * Content manager.
  * Base object for content pages
- *
  */
 class Content extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Core\Contract\IUrl
 {
diff --git a/source/Application/Model/ContentList.php b/source/Application/Model/ContentList.php
index 36475e2daf..daa749080d 100644
--- a/source/Application/Model/ContentList.php
+++ b/source/Application/Model/ContentList.php
@@ -12,7 +12,6 @@
 /**
  * Content list manager.
  * Collects list of content
- *
  */
 class ContentList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Contract/ArticleInterface.php b/source/Application/Model/Contract/ArticleInterface.php
index 2809e0b623..ddca7b01ff 100644
--- a/source/Application/Model/Contract/ArticleInterface.php
+++ b/source/Application/Model/Contract/ArticleInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * Article interface
- *
  */
 interface ArticleInterface
 {
diff --git a/source/Application/Model/Contract/CacheConnectorInterface.php b/source/Application/Model/Contract/CacheConnectorInterface.php
index 9dbdb43e15..7ad1e3c664 100644
--- a/source/Application/Model/Contract/CacheConnectorInterface.php
+++ b/source/Application/Model/Contract/CacheConnectorInterface.php
@@ -9,7 +9,6 @@
 
 /**
  * CacheConnector interface
- *
  */
 interface CacheConnectorInterface
 {
diff --git a/source/Application/Model/Country.php b/source/Application/Model/Country.php
index 126808dcb6..da3d42135a 100644
--- a/source/Application/Model/Country.php
+++ b/source/Application/Model/Country.php
@@ -11,7 +11,6 @@
 
 /**
  * Country manager
- *
  */
 class Country extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/CountryList.php b/source/Application/Model/CountryList.php
index 5979a924a4..7018a6dbe8 100644
--- a/source/Application/Model/CountryList.php
+++ b/source/Application/Model/CountryList.php
@@ -10,7 +10,6 @@
 /**
  * Country list manager class.
  * Collects a list of countries according to collection rules (active).
- *
  */
 class CountryList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Delivery.php b/source/Application/Model/Delivery.php
index 65e850bb80..33063bfc02 100644
--- a/source/Application/Model/Delivery.php
+++ b/source/Application/Model/Delivery.php
@@ -12,7 +12,6 @@
 /**
  * Order delivery manager.
  * Currently calculates price/costs.
- *
  */
 class Delivery extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/DeliveryList.php b/source/Application/Model/DeliveryList.php
index 77a9bc8357..c742422554 100644
--- a/source/Application/Model/DeliveryList.php
+++ b/source/Application/Model/DeliveryList.php
@@ -12,7 +12,6 @@
 
 /**
  * Delivery list manager.
- *
  */
 class DeliveryList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/DeliverySet.php b/source/Application/Model/DeliverySet.php
index 41f0c19142..8f8a46205f 100644
--- a/source/Application/Model/DeliverySet.php
+++ b/source/Application/Model/DeliverySet.php
@@ -11,7 +11,6 @@
 
 /**
  * Order delivery set manager.
- *
  */
 class DeliverySet extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/DeliverySetList.php b/source/Application/Model/DeliverySetList.php
index 01aa9de814..008a7273bf 100644
--- a/source/Application/Model/DeliverySetList.php
+++ b/source/Application/Model/DeliverySetList.php
@@ -12,7 +12,6 @@
 
 /**
  * DeliverySet list manager.
- *
  */
 class DeliverySetList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Diagnostics.php b/source/Application/Model/Diagnostics.php
index b15c732816..9dade9ed3d 100644
--- a/source/Application/Model/Diagnostics.php
+++ b/source/Application/Model/Diagnostics.php
@@ -10,7 +10,6 @@
 /**
  * Diagnostic tool model
  * Stores configuration and public diagnostic methods for shop diagnostics
- *
  */
 class Diagnostics
 {
diff --git a/source/Application/Model/DiagnosticsOutput.php b/source/Application/Model/DiagnosticsOutput.php
index f4514a54b2..fc28a9feea 100644
--- a/source/Application/Model/DiagnosticsOutput.php
+++ b/source/Application/Model/DiagnosticsOutput.php
@@ -10,7 +10,6 @@
 /**
  * Diagnostic tool result outputer
  * Performs OutputKey check of shop files and generates report file.
- *
  */
 class DiagnosticsOutput
 {
diff --git a/source/Application/Model/Discount.php b/source/Application/Model/Discount.php
index b002203c59..341e7860a2 100644
--- a/source/Application/Model/Discount.php
+++ b/source/Application/Model/Discount.php
@@ -14,7 +14,6 @@
 
 /**
  * Discounts manager.
- *
  */
 class Discount extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/DiscountList.php b/source/Application/Model/DiscountList.php
index 2aec7455dc..824837fd51 100644
--- a/source/Application/Model/DiscountList.php
+++ b/source/Application/Model/DiscountList.php
@@ -12,7 +12,6 @@
 /**
  * Discount list manager.
  * Organizes list of discount objects.
- *
  */
 class DiscountList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/File.php b/source/Application/Model/File.php
index 23507a1c85..5b24b1c194 100644
--- a/source/Application/Model/File.php
+++ b/source/Application/Model/File.php
@@ -14,7 +14,6 @@
 
 /**
  * Article files manager.
- *
  */
 class File extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
@@ -75,7 +74,6 @@ class File extends \OxidEsales\Eshop\Core\Model\BaseModel
 
     /**
      * Initialises the instance
-     *
      */
     public function __construct()
     {
diff --git a/source/Application/Model/FileCollector.php b/source/Application/Model/FileCollector.php
index e6654862d6..6abebc86d2 100644
--- a/source/Application/Model/FileCollector.php
+++ b/source/Application/Model/FileCollector.php
@@ -12,7 +12,6 @@
 /**
  * Directory reader.
  * Performs reading of file list of one shop directory
- *
  */
 class FileCollector
 {
diff --git a/source/Application/Model/Groups.php b/source/Application/Model/Groups.php
index 3431481c3a..e4f8bafc71 100644
--- a/source/Application/Model/Groups.php
+++ b/source/Application/Model/Groups.php
@@ -12,7 +12,6 @@
 /**
  * Group manager.
  * Base class for user groups. Does nothing special yet.
- *
  */
 class Groups extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/Maintenance.php b/source/Application/Model/Maintenance.php
index a065499ae7..5a4854206a 100644
--- a/source/Application/Model/Maintenance.php
+++ b/source/Application/Model/Maintenance.php
@@ -9,7 +9,6 @@
 
 /**
  * Maintenance task handler. Maintenance tasks are called periodically, by cronTab (configure on your needs)
- *
  */
 class Maintenance
 {
diff --git a/source/Application/Model/Manufacturer.php b/source/Application/Model/Manufacturer.php
index cb94149144..7d0661ee51 100644
--- a/source/Application/Model/Manufacturer.php
+++ b/source/Application/Model/Manufacturer.php
@@ -12,7 +12,6 @@
 
 /**
  * Manufacturer manager
- *
  */
 class Manufacturer extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Core\Contract\IUrl
 {
diff --git a/source/Application/Model/ManufacturerList.php b/source/Application/Model/ManufacturerList.php
index 5b65487533..9dc64c33bc 100644
--- a/source/Application/Model/ManufacturerList.php
+++ b/source/Application/Model/ManufacturerList.php
@@ -13,7 +13,6 @@
 /**
  * Manufacturer list manager.
  * Collects list of manufacturers according to collection rules (activ, etc.).
- *
  */
 class ManufacturerList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/MdVariant.php b/source/Application/Model/MdVariant.php
index 5395fbda85..9be5526a18 100644
--- a/source/Application/Model/MdVariant.php
+++ b/source/Application/Model/MdVariant.php
@@ -11,7 +11,6 @@
 
 /**
  * Defines an element of multidimentional variant name tree structure. Contains article id, variant name, URL, price, price text, and a subset of MD variants.
- *
  */
 class MdVariant extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/MediaUrl.php b/source/Application/Model/MediaUrl.php
index 8a79dc7ae6..d7fac2591d 100644
--- a/source/Application/Model/MediaUrl.php
+++ b/source/Application/Model/MediaUrl.php
@@ -9,7 +9,6 @@
 
 /**
  * Media URL handler
- *
  */
 class MediaUrl extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/News.php b/source/Application/Model/News.php
index cdd05622fe..03fde70767 100644
--- a/source/Application/Model/News.php
+++ b/source/Application/Model/News.php
@@ -19,7 +19,6 @@
  * these user may read news), etc.
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a module in v6.0.0
- *
  */
 class News extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/NewsList.php b/source/Application/Model/NewsList.php
index 4b709a4b7e..ef3fd00f78 100644
--- a/source/Application/Model/NewsList.php
+++ b/source/Application/Model/NewsList.php
@@ -13,9 +13,7 @@
  * News list manager.
  * Creates news objects, fetches its data.
  *
- *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a module in v6.0.0
- *
  */
 class NewsList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/NewsSubscribed.php b/source/Application/Model/NewsSubscribed.php
index de4c37b275..41e13ab6d7 100644
--- a/source/Application/Model/NewsSubscribed.php
+++ b/source/Application/Model/NewsSubscribed.php
@@ -14,7 +14,6 @@
  * Newsletter Subscriptions manager
  * Performs user managing function
  * information, deletion and other.
- *
  */
 class NewsSubscribed extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/Newsletter.php b/source/Application/Model/Newsletter.php
index 157cbcb5a4..bc8e4a715f 100644
--- a/source/Application/Model/Newsletter.php
+++ b/source/Application/Model/Newsletter.php
@@ -15,7 +15,6 @@
  * Newsletter manager.
  * Performs creation of newsletter text, assign newsletter to user groups,
  * deletes and etc.
- *
  */
 class Newsletter extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/Order.php b/source/Application/Model/Order.php
index cb7df9121c..9c013e4eb9 100644
--- a/source/Application/Model/Order.php
+++ b/source/Application/Model/Order.php
@@ -20,7 +20,6 @@
 /**
  * Order manager.
  * Performs creation assigning, updating, deleting and other order functions.
- *
  */
 class Order extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/OrderArticleList.php b/source/Application/Model/OrderArticleList.php
index 28d6ab7155..81f0f6ec2c 100644
--- a/source/Application/Model/OrderArticleList.php
+++ b/source/Application/Model/OrderArticleList.php
@@ -11,7 +11,6 @@
 
 /**
  * Order article list manager.
- *
  */
 class OrderArticleList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/OrderFile.php b/source/Application/Model/OrderFile.php
index 32561ff086..1e25688fe8 100644
--- a/source/Application/Model/OrderFile.php
+++ b/source/Application/Model/OrderFile.php
@@ -12,7 +12,6 @@
 
 /**
  * Article file link manager.
- *
  */
 class OrderFile extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/OrderFileList.php b/source/Application/Model/OrderFileList.php
index d22e2794c9..88e339d0f8 100644
--- a/source/Application/Model/OrderFileList.php
+++ b/source/Application/Model/OrderFileList.php
@@ -9,7 +9,6 @@
 
 /**
  * Article file link manager.
- *
  */
 class OrderFileList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Payment.php b/source/Application/Model/Payment.php
index 5872860a8e..6ff4518197 100644
--- a/source/Application/Model/Payment.php
+++ b/source/Application/Model/Payment.php
@@ -14,7 +14,6 @@
 /**
  * Payment manager.
  * Performs payment methods, such as assigning to someone, returning value etc.
- *
  */
 class Payment extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Application/Model/PaymentGateway.php b/source/Application/Model/PaymentGateway.php
index ca0cf6ad46..3f6e3d90bb 100644
--- a/source/Application/Model/PaymentGateway.php
+++ b/source/Application/Model/PaymentGateway.php
@@ -10,7 +10,6 @@
 /**
  * Payment gateway manager.
  * Checks and sets payment method data, executes payment.
- *
  */
 class PaymentGateway extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/PaymentList.php b/source/Application/Model/PaymentList.php
index fa3985d849..c1b69c02d5 100644
--- a/source/Application/Model/PaymentList.php
+++ b/source/Application/Model/PaymentList.php
@@ -11,7 +11,6 @@
 
 /**
  * Payment list manager.
- *
  */
 class PaymentList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/PriceAlarm.php b/source/Application/Model/PriceAlarm.php
index f6f39cc2db..3eee150a77 100644
--- a/source/Application/Model/PriceAlarm.php
+++ b/source/Application/Model/PriceAlarm.php
@@ -13,7 +13,6 @@
 /**
  * PriceAlarm manager.
  * Performs PriceAlarm data/objects loading, deleting.
- *
  */
 class PriceAlarm extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/Rating.php b/source/Application/Model/Rating.php
index 69917d1630..fd98472b92 100644
--- a/source/Application/Model/Rating.php
+++ b/source/Application/Model/Rating.php
@@ -12,7 +12,6 @@
 /**
  * Article rate manager.
  * Performs loading, updating, inserting of article rates.
- *
  */
 class Rating extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/RecommendationList.php b/source/Application/Model/RecommendationList.php
index 714de8b3fb..a10da30de6 100644
--- a/source/Application/Model/RecommendationList.php
+++ b/source/Application/Model/RecommendationList.php
@@ -17,7 +17,6 @@
  * Recommendation list manager class.
  *
  * @deprecated since v5.3 (2016-06-17); Listmania will be moved to an own module.
- *
  */
 class RecommendationList extends \OxidEsales\Eshop\Core\Model\BaseModel implements \OxidEsales\Eshop\Core\Contract\IUrl
 {
diff --git a/source/Application/Model/Remark.php b/source/Application/Model/Remark.php
index 27b87977e3..dc224fecae 100644
--- a/source/Application/Model/Remark.php
+++ b/source/Application/Model/Remark.php
@@ -12,7 +12,6 @@
 
 /**
  * Remark manager.
- *
  */
 class Remark extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/RequiredAddressFields.php b/source/Application/Model/RequiredAddressFields.php
index f523ee2642..e27a9d4879 100644
--- a/source/Application/Model/RequiredAddressFields.php
+++ b/source/Application/Model/RequiredAddressFields.php
@@ -37,7 +37,6 @@ class RequiredAddressFields
 
     /**
      * Sets default required fields either from config or from _aDefaultRequiredFields.
-     *
      */
     public function __construct()
     {
diff --git a/source/Application/Model/RequiredFieldValidator.php b/source/Application/Model/RequiredFieldValidator.php
index 52a1f433fb..3fa0cd9cea 100644
--- a/source/Application/Model/RequiredFieldValidator.php
+++ b/source/Application/Model/RequiredFieldValidator.php
@@ -9,7 +9,6 @@
 
 /**
  * Class for validating address
- *
  */
 class RequiredFieldValidator
 {
diff --git a/source/Application/Model/RequiredFieldsValidator.php b/source/Application/Model/RequiredFieldsValidator.php
index 930646f936..e80afc9343 100644
--- a/source/Application/Model/RequiredFieldsValidator.php
+++ b/source/Application/Model/RequiredFieldsValidator.php
@@ -9,7 +9,6 @@
 
 /**
  * Class for validating address
- *
  */
 class RequiredFieldsValidator
 {
diff --git a/source/Application/Model/Review.php b/source/Application/Model/Review.php
index 4bddaf7c43..139b43a089 100644
--- a/source/Application/Model/Review.php
+++ b/source/Application/Model/Review.php
@@ -12,7 +12,6 @@
 /**
  * Article review manager.
  * Performs loading, updating, inserting of article review.
- *
  */
 class Review extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/RssFeed.php b/source/Application/Model/RssFeed.php
index 71c3ec6f9b..77f4b6242f 100644
--- a/source/Application/Model/RssFeed.php
+++ b/source/Application/Model/RssFeed.php
@@ -16,7 +16,6 @@
 /**
  * Rss feed manager
  * loads needed rss data
- *
  */
 class RssFeed extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/Search.php b/source/Application/Model/Search.php
index 04536afdae..eb618a3abb 100644
--- a/source/Application/Model/Search.php
+++ b/source/Application/Model/Search.php
@@ -12,7 +12,6 @@
 
 /**
  * Implements search
- *
  */
 class Search extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/SelectList.php b/source/Application/Model/SelectList.php
index f19f8d84ed..5fa9d2129c 100644
--- a/source/Application/Model/SelectList.php
+++ b/source/Application/Model/SelectList.php
@@ -13,7 +13,6 @@
 
 /**
  * Select list manager
- *
  */
 class SelectList extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Core\Contract\ISelectList
 {
diff --git a/source/Application/Model/Selection.php b/source/Application/Model/Selection.php
index ee0f7488cb..be4d982a88 100644
--- a/source/Application/Model/Selection.php
+++ b/source/Application/Model/Selection.php
@@ -11,7 +11,6 @@
 
 /**
  * Variant selection container class
- *
  */
 class Selection
 {
diff --git a/source/Application/Model/SeoEncoderArticle.php b/source/Application/Model/SeoEncoderArticle.php
index 0202e5fd35..45c0fb8d50 100644
--- a/source/Application/Model/SeoEncoderArticle.php
+++ b/source/Application/Model/SeoEncoderArticle.php
@@ -15,7 +15,6 @@
 
 /**
  * Seo encoder for articles
- *
  */
 class SeoEncoderArticle extends \OxidEsales\Eshop\Core\SeoEncoder
 {
diff --git a/source/Application/Model/SeoEncoderVendor.php b/source/Application/Model/SeoEncoderVendor.php
index 7dcfe69c47..8cbfaeec9a 100644
--- a/source/Application/Model/SeoEncoderVendor.php
+++ b/source/Application/Model/SeoEncoderVendor.php
@@ -11,7 +11,6 @@
 
 /**
  * Seo encoder base
- *
  */
 class SeoEncoderVendor extends \OxidEsales\Eshop\Core\SeoEncoder
 {
diff --git a/source/Application/Model/ShopViewValidator.php b/source/Application/Model/ShopViewValidator.php
index 2d9c26ef2a..97758bfbba 100644
--- a/source/Application/Model/ShopViewValidator.php
+++ b/source/Application/Model/ShopViewValidator.php
@@ -12,7 +12,6 @@
 /**
  * Shop view validator.
  * checks which views are valid / invalid
- *
  */
 class ShopViewValidator
 {
diff --git a/source/Application/Model/SimpleVariant.php b/source/Application/Model/SimpleVariant.php
index ab572271a7..bfd8d0c124 100644
--- a/source/Application/Model/SimpleVariant.php
+++ b/source/Application/Model/SimpleVariant.php
@@ -12,7 +12,6 @@
 
 /**
  * Lightweight variant handler. Implemnets only absolutely needed oxArticle methods.
- *
  */
 class SimpleVariant extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Core\Contract\IUrl
 {
@@ -67,7 +66,6 @@ class SimpleVariant extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel impl
 
     /**
      * Initializes instance
-     *
      */
     public function __construct()
     {
diff --git a/source/Application/Model/SimpleVariantList.php b/source/Application/Model/SimpleVariantList.php
index 304f3f75ef..9d1c092aed 100644
--- a/source/Application/Model/SimpleVariantList.php
+++ b/source/Application/Model/SimpleVariantList.php
@@ -9,7 +9,6 @@
 
 /**
  * Simple variant list.
- *
  */
 class SimpleVariantList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/SmartyRenderer.php b/source/Application/Model/SmartyRenderer.php
index 0a359b536c..7f965bd1dd 100644
--- a/source/Application/Model/SmartyRenderer.php
+++ b/source/Application/Model/SmartyRenderer.php
@@ -15,7 +15,6 @@
  *
  * Smarty renderer class
  * Renders smarty template with given parameters and returns rendered body.
- *
  */
 class SmartyRenderer
 {
diff --git a/source/Application/Model/User.php b/source/Application/Model/User.php
index 97bfb7ab0b..1b8e58c82c 100644
--- a/source/Application/Model/User.php
+++ b/source/Application/Model/User.php
@@ -22,7 +22,6 @@
  * User manager.
  * Performs user managing function, as assigning to groups, updating
  * information, deletion and other.
- *
  */
 class User extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
@@ -2064,8 +2063,6 @@ public function getUpdateId()
      *                                        MD5 and SHA512 is still supported in order support login with older
      *                                        password hashes. Therefor this method might not be
      *                                        compatible with the current passhword hash any more.
-     *
-
      *
      * @return string
      */
diff --git a/source/Application/Model/UserBasket.php b/source/Application/Model/UserBasket.php
index 02da5a3500..dd35b58e94 100644
--- a/source/Application/Model/UserBasket.php
+++ b/source/Application/Model/UserBasket.php
@@ -17,7 +17,6 @@
  * It is more relevant to wishlist and noticelist than to shoping basket.
  * Collects shopping basket information, updates it (DB level), removes or adds
  * articles to it.
- *
  */
 class UserBasket extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/UserBasketItem.php b/source/Application/Model/UserBasketItem.php
index 46b259350d..ed335028dc 100644
--- a/source/Application/Model/UserBasketItem.php
+++ b/source/Application/Model/UserBasketItem.php
@@ -12,7 +12,6 @@
 /**
  * Shopping basket item manager.
  * Manager class for shopping basket item (class may be overriden).
- *
  */
 class UserBasketItem extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/UserList.php b/source/Application/Model/UserList.php
index 5eaef01314..a077f2d841 100644
--- a/source/Application/Model/UserList.php
+++ b/source/Application/Model/UserList.php
@@ -11,7 +11,6 @@
 
 /**
  * User list manager.
- *
  */
 class UserList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/UserPayment.php b/source/Application/Model/UserPayment.php
index 79bef4bbeb..fb3fc06fb4 100644
--- a/source/Application/Model/UserPayment.php
+++ b/source/Application/Model/UserPayment.php
@@ -15,7 +15,6 @@
  * User payment manager.
  * Performs assigning, loading, inserting and updating functions for
  * user payment.
- *
  */
 class UserPayment extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/VariantHandler.php b/source/Application/Model/VariantHandler.php
index a8c920f0f9..85a69f49ac 100644
--- a/source/Application/Model/VariantHandler.php
+++ b/source/Application/Model/VariantHandler.php
@@ -12,7 +12,6 @@
 
 /**
  * VariantHandler encapsulates methods dealing with multidimensional variant and variant names.
- *
  */
 class VariantHandler extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/VariantSelectList.php b/source/Application/Model/VariantSelectList.php
index 863795e8ae..b1430e075b 100644
--- a/source/Application/Model/VariantSelectList.php
+++ b/source/Application/Model/VariantSelectList.php
@@ -11,7 +11,6 @@
 
 /**
  * Variant selection lists manager class
- *
  */
 class VariantSelectList implements \OxidEsales\Eshop\Core\Contract\ISelectList
 {
diff --git a/source/Application/Model/VatSelector.php b/source/Application/Model/VatSelector.php
index d627980c61..b567c86c2b 100644
--- a/source/Application/Model/VatSelector.php
+++ b/source/Application/Model/VatSelector.php
@@ -12,7 +12,6 @@
 
 /**
  * Class, responsible for retrieving correct vat for users and articles
- *
  */
 class VatSelector extends \OxidEsales\Eshop\Core\Base
 {
diff --git a/source/Application/Model/Vendor.php b/source/Application/Model/Vendor.php
index 793dcd79f4..385f1300f4 100644
--- a/source/Application/Model/Vendor.php
+++ b/source/Application/Model/Vendor.php
@@ -12,7 +12,6 @@
 
 /**
  * Vendor manager
- *
  */
 class Vendor extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Core\Contract\IUrl
 {
diff --git a/source/Application/Model/VendorList.php b/source/Application/Model/VendorList.php
index 4827e9203f..4235a672b2 100644
--- a/source/Application/Model/VendorList.php
+++ b/source/Application/Model/VendorList.php
@@ -13,7 +13,6 @@
 /**
  * Vendor list manager.
  * Collects list of vendors according to collection rules (activ, etc.).
- *
  */
 class VendorList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/Voucher.php b/source/Application/Model/Voucher.php
index 60dbe52ee1..7d6c162dae 100644
--- a/source/Application/Model/Voucher.php
+++ b/source/Application/Model/Voucher.php
@@ -16,7 +16,6 @@
  * Voucher manager.
  * Performs deletion, generating, assigning to group and other voucher
  * managing functions.
- *
  */
 class Voucher extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
@@ -243,7 +242,6 @@ protected function _isAvailablePrice($dPrice)
      * @throws oxVoucherException exception
      *
      * @return bool
-     *
      */
     protected function _isAvailableWithSameSeries($aVouchers)
     {
diff --git a/source/Application/Model/VoucherList.php b/source/Application/Model/VoucherList.php
index 38b694a479..3cb35f6ab4 100644
--- a/source/Application/Model/VoucherList.php
+++ b/source/Application/Model/VoucherList.php
@@ -9,7 +9,6 @@
 
 /**
  * Voucher list manager.
- *
  */
 class VoucherList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
diff --git a/source/Application/Model/VoucherSerie.php b/source/Application/Model/VoucherSerie.php
index e270683294..74a4caf0e3 100644
--- a/source/Application/Model/VoucherSerie.php
+++ b/source/Application/Model/VoucherSerie.php
@@ -13,7 +13,6 @@
 /**
  * Voucher serie manager.
  * Manages list of available Vouchers (fetches, deletes, etc.).
- *
  */
 class VoucherSerie extends \OxidEsales\Eshop\Core\Model\BaseModel
 {
diff --git a/source/Application/Model/Wrapping.php b/source/Application/Model/Wrapping.php
index e23d1198fe..600f1d7c6a 100644
--- a/source/Application/Model/Wrapping.php
+++ b/source/Application/Model/Wrapping.php
@@ -13,7 +13,6 @@
 /**
  * Wrapping manager.
  * Performs Wrapping data/objects loading, deleting.
- *
  */
 class Wrapping extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {
diff --git a/source/Core/CompanyVatInChecker.php b/source/Core/CompanyVatInChecker.php
index cc9c2ee7fb..6b60a7cfad 100644
--- a/source/Core/CompanyVatInChecker.php
+++ b/source/Core/CompanyVatInChecker.php
@@ -9,7 +9,6 @@
 
 /**
  * Company VAT identification number (VATIN) checker
- *
  */
 abstract class CompanyVatInChecker
 {
diff --git a/source/Core/Contract/ControllerMapProviderInterface.php b/source/Core/Contract/ControllerMapProviderInterface.php
index 3801dd4863..8e15e73bd5 100644
--- a/source/Core/Contract/ControllerMapProviderInterface.php
+++ b/source/Core/Contract/ControllerMapProviderInterface.php
@@ -11,7 +11,6 @@
  * The implementation of this class determines the controllers which should be allowed to be called directly via
  * HTTP GET/POST Parameters, inside form actions or with oxid_include_widget.
  * Those controllers are specified e.g. inside a form action with a controller key which is mapped to its class.
- *
  */
 interface ControllerMapProviderInterface
 {
diff --git a/source/Core/Contract/IDisplayError.php b/source/Core/Contract/IDisplayError.php
index 4b0e6dae48..9aaf595dba 100644
--- a/source/Core/Contract/IDisplayError.php
+++ b/source/Core/Contract/IDisplayError.php
@@ -9,7 +9,6 @@
 
 /**
  * DisplayError interface
- *
  */
 interface IDisplayError
 {
diff --git a/source/Core/Contract/ISelectList.php b/source/Core/Contract/ISelectList.php
index 674f29f370..e4e006ec1a 100644
--- a/source/Core/Contract/ISelectList.php
+++ b/source/Core/Contract/ISelectList.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface for selection list based objects
- *
  */
 interface ISelectList
 {
diff --git a/source/Core/Contract/IUrl.php b/source/Core/Contract/IUrl.php
index 79c976dbfd..e36d4b47f3 100644
--- a/source/Core/Contract/IUrl.php
+++ b/source/Core/Contract/IUrl.php
@@ -9,7 +9,6 @@
 
 /**
  * Interface for object URLs getters
- *
  */
 interface IUrl
 {
diff --git a/source/Core/Counter.php b/source/Core/Counter.php
index 3762f30512..ccb12f454b 100644
--- a/source/Core/Counter.php
+++ b/source/Core/Counter.php
@@ -11,7 +11,6 @@
 
 /**
  * Counter class
- *
  */
 class Counter
 {
diff --git a/source/Core/Dao/ApplicationServerDao.php b/source/Core/Dao/ApplicationServerDao.php
index 76f12e3de0..6da5746716 100644
--- a/source/Core/Dao/ApplicationServerDao.php
+++ b/source/Core/Dao/ApplicationServerDao.php
@@ -76,7 +76,6 @@ public function findAll()
      * Deletes the entity with the given id.
      *
      * @param string $id An id of the entity to delete.
-     *
      */
     public function delete($id)
     {
diff --git a/source/Core/Database/Adapter/Doctrine/Database.php b/source/Core/Database/Adapter/Doctrine/Database.php
index dbe026134b..ae9f0772c4 100644
--- a/source/Core/Database/Adapter/Doctrine/Database.php
+++ b/source/Core/Database/Adapter/Doctrine/Database.php
@@ -199,7 +199,6 @@ protected function getPdoMysqlConnectionParameters(array $connectionParameters)
      * Adds the param driverOptions to an existing array of connection parameters
      *
      * @param array $existingParameters
-     *
      */
     protected function addDriverOptions(array &$existingParameters)
     {
@@ -231,7 +230,6 @@ protected function getMySqlInitCommand()
      *
      * @param array  $existingParameters
      * @param string $connectionCharset
-     *
      */
     protected function addConnectionCharset(array &$existingParameters, $connectionCharset)
     {
diff --git a/source/Core/DbMetaDataHandler.php b/source/Core/DbMetaDataHandler.php
index 7d30eeeab1..d96854dbc6 100644
--- a/source/Core/DbMetaDataHandler.php
+++ b/source/Core/DbMetaDataHandler.php
@@ -212,7 +212,6 @@ public function getAllMultiTables($table)
      * @param string $lang  language id
      *
      * @return string
-     *
      */
     protected function _getCreateTableSetSql($table, $lang)
     {
diff --git a/source/Core/Exception/ArticleInputException.php b/source/Core/Exception/ArticleInputException.php
index 5033ba6f78..42773d19b9 100644
--- a/source/Core/Exception/ArticleInputException.php
+++ b/source/Core/Exception/ArticleInputException.php
@@ -9,7 +9,6 @@
 
 /**
  * Article input exception..
- *
  */
 class ArticleInputException extends \OxidEsales\Eshop\Core\Exception\ArticleException
 {
diff --git a/source/Core/Exception/RoutingException.php b/source/Core/Exception/RoutingException.php
index 63f8418c78..5dc727e309 100644
--- a/source/Core/Exception/RoutingException.php
+++ b/source/Core/Exception/RoutingException.php
@@ -10,7 +10,6 @@
 /**
  * e.g.:
  * - no match for requested controller id
- *
  */
 class RoutingException extends \OxidEsales\Eshop\Core\Exception\StandardException
 {
diff --git a/source/Core/Exception/StandardException.php b/source/Core/Exception/StandardException.php
index 4a70aba7d7..f108e4d3a2 100644
--- a/source/Core/Exception/StandardException.php
+++ b/source/Core/Exception/StandardException.php
@@ -9,7 +9,6 @@
 
 /**
  * Basic exception class
- *
  */
 class StandardException extends \Exception
 {
diff --git a/source/Core/InputValidator.php b/source/Core/InputValidator.php
index bf49ec4100..a3c006a7b8 100644
--- a/source/Core/InputValidator.php
+++ b/source/Core/InputValidator.php
@@ -52,7 +52,6 @@ class InputValidator extends \OxidEsales\Eshop\Core\Base
 
     /**
      * Class constructor. The constructor is defined in order to be possible to call parent::__construct() in modules.
-     *
      */
     public function __construct()
     {
diff --git a/source/Core/Module/ModuleSmartyPluginDirectories.php b/source/Core/Module/ModuleSmartyPluginDirectories.php
index faf32bac69..d38d21715c 100644
--- a/source/Core/Module/ModuleSmartyPluginDirectories.php
+++ b/source/Core/Module/ModuleSmartyPluginDirectories.php
@@ -16,7 +16,6 @@
  * @see      https://oxidforge.org/en/core-oxid-eshop-classes-must-not-be-extended.html
  *
  * @ignore   This class will not be included in documentation.
- *
  */
 class ModuleSmartyPluginDirectories
 {
diff --git a/source/Core/Module/ModuleSmartyPluginDirectoryRepository.php b/source/Core/Module/ModuleSmartyPluginDirectoryRepository.php
index bc30c438df..cf29ceacdf 100644
--- a/source/Core/Module/ModuleSmartyPluginDirectoryRepository.php
+++ b/source/Core/Module/ModuleSmartyPluginDirectoryRepository.php
@@ -19,7 +19,6 @@
  * @see      https://oxidforge.org/en/core-oxid-eshop-classes-must-not-be-extended.html
  *
  * @ignore   This class will not be included in documentation.
- *
  */
 class ModuleSmartyPluginDirectoryRepository
 {
diff --git a/source/Core/Module/ModuleSmartyPluginDirectoryValidator.php b/source/Core/Module/ModuleSmartyPluginDirectoryValidator.php
index 10de8b415b..a69df18962 100644
--- a/source/Core/Module/ModuleSmartyPluginDirectoryValidator.php
+++ b/source/Core/Module/ModuleSmartyPluginDirectoryValidator.php
@@ -19,7 +19,6 @@
  * @see      https://oxidforge.org/en/core-oxid-eshop-classes-must-not-be-extended.html
  *
  * @ignore   This class will not be included in documentation.
- *
  */
 class ModuleSmartyPluginDirectoryValidator
 {
diff --git a/source/Core/Module/ModuleTemplatePathCalculator.php b/source/Core/Module/ModuleTemplatePathCalculator.php
index 96f4c7b499..746176476a 100644
--- a/source/Core/Module/ModuleTemplatePathCalculator.php
+++ b/source/Core/Module/ModuleTemplatePathCalculator.php
@@ -78,7 +78,6 @@ protected function getModulesPath()
      * @param string $templateName
      *
      * @return string
-     *
      */
     public function calculateModuleTemplatePath($templateName)
     {
diff --git a/source/Core/OnlineVatIdCheck.php b/source/Core/OnlineVatIdCheck.php
index 17aefe8314..04a9578a58 100644
--- a/source/Core/OnlineVatIdCheck.php
+++ b/source/Core/OnlineVatIdCheck.php
@@ -34,13 +34,11 @@ class OnlineVatIdCheck extends \OxidEsales\Eshop\Core\CompanyVatInChecker
 
     /**
      * How many times to retry check if server is busy
-     *
      */
     const BUSY_RETRY_CNT = 1;
 
     /**
      * How much to wait between retries (in micro seconds)
-     *
      */
     const BUSY_RETRY_WAITUSEC = 500000;
 
diff --git a/source/Core/SepaBICValidator.php b/source/Core/SepaBICValidator.php
index 3f7cd25775..343e10f450 100644
--- a/source/Core/SepaBICValidator.php
+++ b/source/Core/SepaBICValidator.php
@@ -11,7 +11,6 @@
 
 /**
  * SEPA (Single Euro Payments Area) BIC validation class
- *
  */
 class SepaBICValidator
 {
diff --git a/source/Core/SepaIBANValidator.php b/source/Core/SepaIBANValidator.php
index f92a6578fb..a45dda1535 100644
--- a/source/Core/SepaIBANValidator.php
+++ b/source/Core/SepaIBANValidator.php
@@ -11,7 +11,6 @@
 
 /**
  * SEPA (Single Euro Payments Area) validation class
- *
  */
 class SepaIBANValidator
 {
diff --git a/source/Core/SepaValidator.php b/source/Core/SepaValidator.php
index f7f460effc..dddca4def5 100644
--- a/source/Core/SepaValidator.php
+++ b/source/Core/SepaValidator.php
@@ -9,7 +9,6 @@
 
 /**
  * SEPA (Single Euro Payments Area) validation class
- *
  */
 class SepaValidator
 {
diff --git a/source/Core/Smarty/Plugin/EmosItem.php b/source/Core/Smarty/Plugin/EmosItem.php
index 791a8029ad..235a194034 100644
--- a/source/Core/Smarty/Plugin/EmosItem.php
+++ b/source/Core/Smarty/Plugin/EmosItem.php
@@ -36,7 +36,6 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
 namespace OxidEsales\EshopCommunity\Core\Smarty\Plugin;
diff --git a/source/Internal/Domain/Authentication/Service/BcryptPasswordHashService.php b/source/Internal/Domain/Authentication/Service/BcryptPasswordHashService.php
index bfd1364094..fe754a4061 100644
--- a/source/Internal/Domain/Authentication/Service/BcryptPasswordHashService.php
+++ b/source/Internal/Domain/Authentication/Service/BcryptPasswordHashService.php
@@ -49,7 +49,6 @@ public function __construct(
      *
      * @return string
      * @throws PasswordHashException
-     *
      */
     public function hash(string $password): string
     {
diff --git a/source/Internal/Framework/DIContainer/DataObject/DIConfigWrapper.php b/source/Internal/Framework/DIContainer/DataObject/DIConfigWrapper.php
index 70f20041d6..c70e6a60d0 100644
--- a/source/Internal/Framework/DIContainer/DataObject/DIConfigWrapper.php
+++ b/source/Internal/Framework/DIContainer/DataObject/DIConfigWrapper.php
@@ -241,9 +241,7 @@ private function removeEmptySections()
             }
         }
     }
-    /**
-     *
-     */
+
     private function removeInactiveServices()
     {
         /** @var DIServiceWrapper $service */
diff --git a/source/Internal/Framework/DIContainer/DataObject/DIServiceWrapper.php b/source/Internal/Framework/DIContainer/DataObject/DIServiceWrapper.php
index 60d1ee9153..4e737bfa82 100644
--- a/source/Internal/Framework/DIContainer/DataObject/DIServiceWrapper.php
+++ b/source/Internal/Framework/DIContainer/DataObject/DIServiceWrapper.php
@@ -128,9 +128,6 @@ public function checkClassExists()
         return class_exists($this->getClass());
     }
 
-    /**
-     *
-     */
     private function addShopAwareCallsIfMissing()
     {
         if (!$this->hasCall($this::SET_ACTIVE_SHOPS_METHOD)) {
diff --git a/source/Internal/Framework/Logger/Wrapper/LoggerWrapper.php b/source/Internal/Framework/Logger/Wrapper/LoggerWrapper.php
index 710f580b2c..1b20999b5a 100644
--- a/source/Internal/Framework/Logger/Wrapper/LoggerWrapper.php
+++ b/source/Internal/Framework/Logger/Wrapper/LoggerWrapper.php
@@ -32,7 +32,6 @@ public function __construct(LoggerInterface $logger)
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function emergency($message, array $context = [])
     {
@@ -47,7 +46,6 @@ public function emergency($message, array $context = [])
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function alert($message, array $context = [])
     {
@@ -61,7 +59,6 @@ public function alert($message, array $context = [])
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function critical($message, array $context = [])
     {
@@ -74,7 +71,6 @@ public function critical($message, array $context = [])
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function error($message, array $context = [])
     {
@@ -89,7 +85,6 @@ public function error($message, array $context = [])
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function warning($message, array $context = [])
     {
@@ -101,7 +96,6 @@ public function warning($message, array $context = [])
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function notice($message, array $context = [])
     {
@@ -115,7 +109,6 @@ public function notice($message, array $context = [])
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function info($message, array $context = [])
     {
@@ -127,7 +120,6 @@ public function info($message, array $context = [])
      *
      * @param string $message
      * @param array  $context
-     *
      */
     public function debug($message, array $context = [])
     {
@@ -140,7 +132,6 @@ public function debug($message, array $context = [])
      * @param mixed  $level
      * @param string $message
      * @param array  $context
-     *
      */
     public function log($level, $message, array $context = [])
     {
diff --git a/source/Internal/Framework/Module/Install/Service/ModuleFilesInstallerInterface.php b/source/Internal/Framework/Module/Install/Service/ModuleFilesInstallerInterface.php
index 95144c6b09..80382c5d37 100644
--- a/source/Internal/Framework/Module/Install/Service/ModuleFilesInstallerInterface.php
+++ b/source/Internal/Framework/Module/Install/Service/ModuleFilesInstallerInterface.php
@@ -18,7 +18,6 @@ interface ModuleFilesInstallerInterface
      * Even copies if the target directory is already present.
      *
      * @param OxidEshopPackage $package
-     *
      */
     public function install(OxidEshopPackage $package): void;
 
diff --git a/source/Setup/Database.php b/source/Setup/Database.php
index 936f842e02..09dc2d9e78 100644
--- a/source/Setup/Database.php
+++ b/source/Setup/Database.php
@@ -32,7 +32,6 @@ class Database extends Core
      *
      * @return PDOStatement|int
      * @throws Exception exception is thrown if error occured during sql execution
-     *
      */
     public function execSql($sQ)
     {