diff --git a/upload/catalog/controller/extension/analytics/google.php b/upload/catalog/controller/extension/analytics/google.php
index c874ce66e..e3c0cdfef 100644
--- a/upload/catalog/controller/extension/analytics/google.php
+++ b/upload/catalog/controller/extension/analytics/google.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionAnalyticsGoogle extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/credit_card/sagepay_direct.php b/upload/catalog/controller/extension/credit_card/sagepay_direct.php
index 41ab3a132..786083995 100644
--- a/upload/catalog/controller/extension/credit_card/sagepay_direct.php
+++ b/upload/catalog/controller/extension/credit_card/sagepay_direct.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionCreditCardSagepayDirect extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return void
 	 */
diff --git a/upload/catalog/controller/extension/credit_card/sagepay_server.php b/upload/catalog/controller/extension/credit_card/sagepay_server.php
index 33d2b91f2..f5b43d057 100644
--- a/upload/catalog/controller/extension/credit_card/sagepay_server.php
+++ b/upload/catalog/controller/extension/credit_card/sagepay_server.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionCreditCardSagepayServer extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return void
 	 */
diff --git a/upload/catalog/controller/extension/credit_card/squareup.php b/upload/catalog/controller/extension/credit_card/squareup.php
index c7b311af5..84a61be9e 100644
--- a/upload/catalog/controller/extension/credit_card/squareup.php
+++ b/upload/catalog/controller/extension/credit_card/squareup.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionCreditCardSquareup extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return void
 	 */
diff --git a/upload/catalog/controller/extension/feed/google_base.php b/upload/catalog/controller/extension/feed/google_base.php
index 03745a50a..5077c6cf6 100644
--- a/upload/catalog/controller/extension/feed/google_base.php
+++ b/upload/catalog/controller/extension/feed/google_base.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionFeedGoogleBase extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return void
 	 */
diff --git a/upload/catalog/controller/extension/feed/google_sitemap.php b/upload/catalog/controller/extension/feed/google_sitemap.php
index 8cc7ffa2b..8f9ccd651 100644
--- a/upload/catalog/controller/extension/feed/google_sitemap.php
+++ b/upload/catalog/controller/extension/feed/google_sitemap.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionFeedGoogleSitemap extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return void
 	 */
diff --git a/upload/catalog/controller/extension/module/account.php b/upload/catalog/controller/extension/module/account.php
index ca1a66065..450835141 100644
--- a/upload/catalog/controller/extension/module/account.php
+++ b/upload/catalog/controller/extension/module/account.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleAccount extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/amazon_login.php b/upload/catalog/controller/extension/module/amazon_login.php
index 666f96c8c..ea9f2c00e 100644
--- a/upload/catalog/controller/extension/module/amazon_login.php
+++ b/upload/catalog/controller/extension/module/amazon_login.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleAmazonLogin extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/amazon_pay.php b/upload/catalog/controller/extension/module/amazon_pay.php
index baa0b336b..a5323f63c 100644
--- a/upload/catalog/controller/extension/module/amazon_pay.php
+++ b/upload/catalog/controller/extension/module/amazon_pay.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleAmazonPay extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/category.php b/upload/catalog/controller/extension/module/category.php
index 518754868..5c3abe211 100644
--- a/upload/catalog/controller/extension/module/category.php
+++ b/upload/catalog/controller/extension/module/category.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleCategory extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/divido_calculator.php b/upload/catalog/controller/extension/module/divido_calculator.php
index ea919ad98..888adac29 100644
--- a/upload/catalog/controller/extension/module/divido_calculator.php
+++ b/upload/catalog/controller/extension/module/divido_calculator.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleDividoCalculator extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/filter.php b/upload/catalog/controller/extension/module/filter.php
index a41b6147f..5b19d0b3e 100644
--- a/upload/catalog/controller/extension/module/filter.php
+++ b/upload/catalog/controller/extension/module/filter.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleFilter extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/google_hangouts.php b/upload/catalog/controller/extension/module/google_hangouts.php
index 67a52cde2..cd057054b 100644
--- a/upload/catalog/controller/extension/module/google_hangouts.php
+++ b/upload/catalog/controller/extension/module/google_hangouts.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleGoogleHangouts extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/information.php b/upload/catalog/controller/extension/module/information.php
index 62491d594..d8bf24e94 100644
--- a/upload/catalog/controller/extension/module/information.php
+++ b/upload/catalog/controller/extension/module/information.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleInformation extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/laybuy_layout.php b/upload/catalog/controller/extension/module/laybuy_layout.php
index 3b740fa02..29d8edb5e 100644
--- a/upload/catalog/controller/extension/module/laybuy_layout.php
+++ b/upload/catalog/controller/extension/module/laybuy_layout.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleLaybuyLayout extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/paypal_smart_button.php b/upload/catalog/controller/extension/module/paypal_smart_button.php
index f5cc7f896..c61cbd3a2 100644
--- a/upload/catalog/controller/extension/module/paypal_smart_button.php
+++ b/upload/catalog/controller/extension/module/paypal_smart_button.php
@@ -27,7 +27,7 @@ public function __construct(object $registry) {
 	}
 
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/pilibaba_button.php b/upload/catalog/controller/extension/module/pilibaba_button.php
index 53e8dec58..ec8aa8273 100644
--- a/upload/catalog/controller/extension/module/pilibaba_button.php
+++ b/upload/catalog/controller/extension/module/pilibaba_button.php
@@ -6,8 +6,8 @@
  */
 class ControllerExtensionModulePilibabaButton extends Controller {
 	/**
-     * Index
-     *
+	 * Index
+	 *
 	 * @return string
 	 */
 	public function index(): string {
diff --git a/upload/catalog/controller/extension/module/sagepay_direct_cards.php b/upload/catalog/controller/extension/module/sagepay_direct_cards.php
index 37b3a4661..e03a7f8b6 100644
--- a/upload/catalog/controller/extension/module/sagepay_direct_cards.php
+++ b/upload/catalog/controller/extension/module/sagepay_direct_cards.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleSagepayDirectCards extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/sagepay_server_cards.php b/upload/catalog/controller/extension/module/sagepay_server_cards.php
index c4f049f62..3bf954209 100644
--- a/upload/catalog/controller/extension/module/sagepay_server_cards.php
+++ b/upload/catalog/controller/extension/module/sagepay_server_cards.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleSagepayServerCards extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/catalog/controller/extension/module/store.php b/upload/catalog/controller/extension/module/store.php
index d352f3f49..95ea77a17 100644
--- a/upload/catalog/controller/extension/module/store.php
+++ b/upload/catalog/controller/extension/module/store.php
@@ -6,7 +6,7 @@
  */
 class ControllerExtensionModuleStore extends Controller {
 	/**
-     * Index
+	 * Index
 	 *
 	 * @return string
 	 */
diff --git a/upload/system/library/cache/apcu.php b/upload/system/library/cache/apcu.php
index a0c315c5c..486cd4e87 100644
--- a/upload/system/library/cache/apcu.php
+++ b/upload/system/library/cache/apcu.php
@@ -18,7 +18,7 @@ public function __construct(int $expire = 3600) {
 	 * Get
 	 *
 	 * @param string $key
-	 * 
+	 *
 	 * @return mixed
 	 */
 	public function get(string $key) {
diff --git a/upload/system/library/cart/cart.php b/upload/system/library/cart/cart.php
index 79b9e6a5e..45b9851ae 100644
--- a/upload/system/library/cart/cart.php
+++ b/upload/system/library/cart/cart.php
@@ -7,7 +7,7 @@ class Cart {
 	private object $session;
 	private object $tax;
 	private object $weight;
-	private array  $data = [];
+	private array $data = [];
 
 	/**
 	 * Constructor
diff --git a/upload/system/library/language.php b/upload/system/library/language.php
index ae485a766..77e75d92f 100644
--- a/upload/system/library/language.php
+++ b/upload/system/library/language.php
@@ -30,7 +30,7 @@ public function __construct(string $directory = '') {
 	 * Get
 	 *
 	 * @param string $key
-	 * 
+	 *
 	 * @return string
 	 */
 	public function get(string $key): string {
diff --git a/upload/system/library/template.php b/upload/system/library/template.php
index 4e9c189f0..299961edf 100644
--- a/upload/system/library/template.php
+++ b/upload/system/library/template.php
@@ -19,7 +19,7 @@ class Template {
 	 * Constructor
 	 *
 	 * @param string $adaptor
-	 * 
+	 *
 	 * @return mixed
 	 */
 	public function __construct(string $adaptor) {
@@ -37,7 +37,7 @@ public function __construct(string $adaptor) {
 	 *
 	 * @param string $key
 	 * @param mixed  $value
-	 * 
+	 *
 	 * @return void
 	 */
 	public function set(string $key, $value): void {