diff --git a/ext_localconf.php b/ext_localconf.php
index 3081a66..aee870e 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,11 +1,11 @@
 <?php
 
+// register custom form element
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeRegistry'][1629534119] = [
     'nodeName' => 'iconSelection',
     'priority' => 40,
     'class' => \Blueways\BwIcons\Form\Element\IconSelection::class,
 ];
 
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['bwicons_conf']) || !is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['bwicons_conf'])) {
-    $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['bwicons_conf'] = [];
-}
+// register cache
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['bwicons_conf'] ??= [];
diff --git a/phpmd.baseline.xml b/phpmd.baseline.xml
index c4bb8e6..4203235 100644
--- a/phpmd.baseline.xml
+++ b/phpmd.baseline.xml
@@ -5,11 +5,7 @@
   <violation rule="PHPMD\Rule\CyclomaticComplexity" file="Classes/Provider/CssIconProvider.php" method="getIcons"/>
   <violation rule="PHPMD\Rule\Design\NpathComplexity" file="Classes/Provider/CssIconProvider.php" method="getIcons"/>
   <violation rule="PHPMD\Rule\Design\LongMethod" file="Classes/Provider/CssIconProvider.php" method="getIcons"/>
-  <violation rule="PHPMD\Rule\Naming\LongVariable" file="Classes/Provider/CssIconProvider.php"/>
-  <violation rule="PHPMD\Rule\Controversial\CamelCaseVariableName" file="Classes/Provider/CssIconProvider.php" method="handleCssUrl"/>
   <violation rule="PHPMD\Rule\CyclomaticComplexity" file="Classes/Provider/CssIconProvider.php" method="ruleIsAGlyph"/>
-  <violation rule="PHPMD\Rule\Naming\LongVariable" file="Classes/ViewHelpers/IconViewHelper.php"/>
   <violation rule="PHPMD\Rule\UnusedFormalParameter" file="Classes/ViewHelpers/IconViewHelper.php"/>
-  <violation rule="PHPMD\Rule\Naming\LongVariable" file="Classes/ViewHelpers/IsWhiteViewHelper.php"/>
   <violation rule="PHPMD\Rule\UnusedFormalParameter" file="Classes/ViewHelpers/IsWhiteViewHelper.php"/>
 </phpmd-baseline>
diff --git a/phpmd.xml b/phpmd.xml
index 82d6cfb..27498ed 100644
--- a/phpmd.xml
+++ b/phpmd.xml
@@ -4,6 +4,7 @@
 	<rule ref="rulesets/design.xml"/>
 	<rule ref="rulesets/naming.xml">
 		<exclude name="ShortVariable" />
+		<exclude name="LongVariable" />
 	</rule>
 	<rule ref="rulesets/unusedcode.xml"/>
 	<rule ref="rulesets/controversial.xml"/>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 5fe1b0a..c7e3f83 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2,17 +2,12 @@ parameters:
 	ignoreErrors:
 		-
 			message: "#^Call to an undefined method Sabberworm\\\\CSS\\\\RuleSet\\\\RuleSet\\:\\:getSelectors\\(\\)\\.$#"
-			count: 1
-			path: Classes/Provider/CssIconProvider.php
-
-		-
-			message: "#^Call to an undefined method Sabberworm\\\\CSS\\\\Value\\\\RuleValueList\\:\\:getString\\(\\)\\.$#"
 			count: 3
 			path: Classes/Provider/CssIconProvider.php
 
 		-
-			message: "#^Call to function is_string\\(\\) with Sabberworm\\\\CSS\\\\Value\\\\RuleValueList\\|null will always evaluate to false\\.$#"
-			count: 1
+			message: "#^Call to an undefined method Sabberworm\\\\CSS\\\\Value\\\\RuleValueList\\:\\:getString\\(\\)\\.$#"
+			count: 4
 			path: Classes/Provider/CssIconProvider.php
 
 		-
@@ -25,11 +20,6 @@ parameters:
 			count: 1
 			path: Classes/Provider/CssIconProvider.php
 
-		-
-			message: "#^Parameter \\#1 \\$rule of method Blueways\\\\BwIcons\\\\Provider\\\\CssIconProvider\\:\\:adjustSrcOfFontFaceRule\\(\\) expects Sabberworm\\\\CSS\\\\RuleSet\\\\AtRuleSet, Sabberworm\\\\CSS\\\\RuleSet\\\\RuleSet given\\.$#"
-			count: 1
-			path: Classes/Provider/CssIconProvider.php
-
 		-
 			message: "#^Unsafe call to private method Blueways\\\\BwIcons\\\\Provider\\\\CssIconProvider\\:\\:glyphIsNotInSet\\(\\) through static\\:\\:\\.$#"
 			count: 1