diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index 80d7c98..a01e33c 100755
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -45,7 +45,7 @@ protected function initializeAction()
         $pageId = (int)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id');
         $frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
         $persistenceConfiguration = array('persistence' => array('storagePid' => $pageId));
-        $this->configurationManager->setConfiguration(array_merge($frameworkConfiguration, $persistenceConfiguration));
+        $this->configurationManager->setConfiguration(\array_merge($frameworkConfiguration, $persistenceConfiguration));
     }
 
     /**
diff --git a/Classes/Controller/ConsentController.php b/Classes/Controller/ConsentController.php
index 295c45c..998396a 100755
--- a/Classes/Controller/ConsentController.php
+++ b/Classes/Controller/ConsentController.php
@@ -120,7 +120,7 @@ protected function renderAssetsForRequest($request)
      */
     private function klaroConfigBuild(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $services)
     {
-        if (is_numeric($this->settings['klaro']['privacyPolicy'])) {
+        if (\is_numeric($this->settings['klaro']['privacyPolicy'])) {
             $privacyPage = $this->uriBuilder
                 ->reset()
                 ->setTargetPageUid((int)$this->settings['klaro']['privacyPolicy'])
@@ -130,7 +130,7 @@ private function klaroConfigBuild(\TYPO3\CMS\Extbase\Persistence\Generic\QueryRe
             $privacyPage = $this->settings['klaro']['privacyPolicy'];
         }
 
-        if (is_numeric($this->settings['klaro']['poweredBy'])) {
+        if (\is_numeric($this->settings['klaro']['poweredBy'])) {
             $poweredByPage = $this->uriBuilder
                 ->reset()
                 ->setTargetPageUid((int)$this->settings['klaro']['poweredBy'])
diff --git a/Classes/ViewHelpers/Format/EscapeViewHelper.php b/Classes/ViewHelpers/Format/EscapeViewHelper.php
index 8a0bd80..920bede 100755
--- a/Classes/ViewHelpers/Format/EscapeViewHelper.php
+++ b/Classes/ViewHelpers/Format/EscapeViewHelper.php
@@ -15,7 +15,7 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
     {
         $value = $renderChildrenClosure();
 
-        if (!is_string($value) && !(is_object($value) && method_exists($value, '__toString'))) {
+        if (!\is_string($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
             return $value;
         }
 
diff --git a/README.md b/README.md
index 04941ff..45f2e3b 100755
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
 Cookie Consent Panel (Optin) with DSGVO/GDPR compliant use of cookies. Preconfigured modules for Google Analytics, Facebook and other frequently used services. Arbitrary expandability with tracking scripts that generate cookies on your website. Support of Google Tag Manager and easy export of Google Tag Manager. Third-party cookies and scripts are only loaded when active consent is given. Website visitors can edit their privacy settings at any time. Automatic update of cookie information when new cookies/scripts are inserted with secure consent procedure. Cookies can be automatically added to the privacy policy via a plugin. Multilingual and full support for desktop, tablet and mobile. Four standard modes for displaying the content solution. Based on [Klaro!](https://github.com/kiprotect/klaro).
 
 ## Links
-Demo: [https://consent.websedit.de/](https://consent.websedit.de/)\
+Demo: [https://consent.websedit.de](https://consent.websedit.de)\
 Documentation: [https://consent.websedit.de/dokumentation](https://consent.websedit.de/dokumentation)\
-TYPO3 Extension Repository: [https://extensions.typo3.org/extension/we_cookie_consent/](https://extensions.typo3.org/extension/we_cookie_consent/)\
-Packagist: [https://packagist.org/packages/websedit/we-cookie-consent](https://packagist.org/packages/websedit/we-cookie-consent)\
+TYPO3 Extension Repository: [https://extensions.typo3.org/extension/we_cookie_consent](https://extensions.typo3.org/extension/we_cookie_consent)\
+Packagist: [https://packagist.org/packages/websedit/we-cookie-consent](https://packagist.org/packages/websedit/we-cookie-consent)
 
 ## Note on v2.0.0
 Due to the update of the klaro library to version 0.7.x there have been some changes. Klaro has revised the generation of the HTML DOM and some CSS classes. We have implemented a fallback function that makes an update from the old 1.3 to the new 2.0 as smooth as possible. Please note that we cannot guarantee that everything will look exactly the same as before, especially with existing customisations to the output in CSS. Therefore, please check the output after an update. 
 
 ## Support
-If you need private or personal support, contact us via our contact form on [https://consent.websedit.de/](https://consent.websedit.de/).
\ No newline at end of file
+If you need private or personal support, contact us via our contact form on [https://consent.websedit.de/](https://consent.websedit.de).
diff --git a/Resources/Private/Backend/Templates/Backend/GtmWizard.html b/Resources/Private/Backend/Templates/Backend/GtmWizard.html
index e72097b..b9c7145 100755
--- a/Resources/Private/Backend/Templates/Backend/GtmWizard.html
+++ b/Resources/Private/Backend/Templates/Backend/GtmWizard.html
@@ -8,11 +8,11 @@ <h1>Google Tag Manager Export Wizard</h1>
                 <thead>
                 <tr>
                     <th class="col-responsive nowrap">&nbsp;</th>
-                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_tag_title.label" /></th>
-                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_title.label" /></th>
-                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_name.label" /></th>
-                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_title.label" /></th>
-                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_name.label" /></th>
+                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_tag_title.label"/></th>
+                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_title.label"/></th>
+                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_name.label"/></th>
+                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_title.label"/></th>
+                    <th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_name.label"/></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -26,11 +26,11 @@ <h1>Google Tag Manager Export Wizard</h1>
 
             <br/>
             <h2>Download JSON File</h2>
-            <f:link.action action="jsonDownload" arguments="{blocks:'{tags:1, triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_all" /></f:link.action>
-            <f:link.action action="jsonDownload" arguments="{blocks:'{triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_triggerAndVariables" /></f:link.action>
+            <f:link.action action="jsonDownload" arguments="{blocks:'{tags:1, triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_all"/></f:link.action>
+            <f:link.action action="jsonDownload" arguments="{blocks:'{triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_triggerAndVariables"/></f:link.action>
         </f:then>
         <f:else>
-            <f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:no_google_tag_manager_services" />
+            <f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:no_google_tag_manager_services"/>
         </f:else>
     </f:if>
 </f:section>
diff --git a/Resources/Private/Partials/Service/facebook.html b/Resources/Private/Partials/Service/facebook.html
index aad464b..f4f86b5 100755
--- a/Resources/Private/Partials/Service/facebook.html
+++ b/Resources/Private/Partials/Service/facebook.html
@@ -15,4 +15,4 @@
     <!-- End Facebook Pixel Code -->
 </f:section>
 
-<f:section name="Footer" />
\ No newline at end of file
+<f:section name="Footer"/>
\ No newline at end of file
diff --git a/Resources/Private/Partials/Service/google-analytics-universal.html b/Resources/Private/Partials/Service/google-analytics-universal.html
index f3743d2..b256aa8 100755
--- a/Resources/Private/Partials/Service/google-analytics-universal.html
+++ b/Resources/Private/Partials/Service/google-analytics-universal.html
@@ -13,4 +13,4 @@
     <!-- End Google Analytics -->
 </f:section>
 
-<f:section name="Footer" />
\ No newline at end of file
+<f:section name="Footer"/>
\ No newline at end of file
diff --git a/Resources/Private/Partials/Service/google-analytics.html b/Resources/Private/Partials/Service/google-analytics.html
index 7d11cd7..dca39d4 100755
--- a/Resources/Private/Partials/Service/google-analytics.html
+++ b/Resources/Private/Partials/Service/google-analytics.html
@@ -10,4 +10,4 @@
     </script>
 </f:section>
 
-<f:section name="Footer" />
\ No newline at end of file
+<f:section name="Footer"/>
\ No newline at end of file
diff --git a/Resources/Private/Partials/Service/google-tagmanager-service.html b/Resources/Private/Partials/Service/google-tagmanager-service.html
index 0f825ab..ee8ea02 100755
--- a/Resources/Private/Partials/Service/google-tagmanager-service.html
+++ b/Resources/Private/Partials/Service/google-tagmanager-service.html
@@ -4,4 +4,4 @@
     </script>
 </f:section>
 
-<f:section name="Footer" />
\ No newline at end of file
+<f:section name="Footer"/>
\ No newline at end of file
diff --git a/Resources/Private/Partials/Service/google-tagmanager.html b/Resources/Private/Partials/Service/google-tagmanager.html
index febf915..79887b0 100755
--- a/Resources/Private/Partials/Service/google-tagmanager.html
+++ b/Resources/Private/Partials/Service/google-tagmanager.html
@@ -8,4 +8,4 @@
     </script>
 </f:section>
 
-<f:section name="Footer" />
\ No newline at end of file
+<f:section name="Footer"/>
\ No newline at end of file
diff --git a/Resources/Private/Partials/Service/matomo.html b/Resources/Private/Partials/Service/matomo.html
index 02aaed4..cb3b66d 100755
--- a/Resources/Private/Partials/Service/matomo.html
+++ b/Resources/Private/Partials/Service/matomo.html
@@ -13,4 +13,4 @@
     </script>
 </f:section>
 
-<f:section name="Footer" />
\ No newline at end of file
+<f:section name="Footer"/>
\ No newline at end of file
diff --git a/Resources/Private/Templates/Consent/List.html b/Resources/Private/Templates/Consent/List.html
index 64cd72e..1d7554a 100755
--- a/Resources/Private/Templates/Consent/List.html
+++ b/Resources/Private/Templates/Consent/List.html
@@ -10,9 +10,9 @@
 					<caption>Cookies</caption>
 					<thead>
 						<tr>
-							<th scope="col"><f:translate key="list.table.title" /></th>
-							<th scope="col"><f:translate key="list.table.description" /></th>
-							<th scope="col"><f:translate key="list.table.maxAge" /></th>
+							<th scope="col"><f:translate key="list.table.title"/></th>
+							<th scope="col"><f:translate key="list.table.description"/></th>
+							<th scope="col"><f:translate key="list.table.maxAge"/></th>
 						</tr>
 					</thead>
 					<tbody>