diff --git a/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php b/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php
index b1a1c8a0b9..2303c43dcc 100644
--- a/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php
+++ b/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php
@@ -72,9 +72,6 @@ public function onKernelRequest(RequestEvent $event)
         }
     }
 
-    /**
-     * @param TokenInterface $token
-     */
     private function isAdminToken($providerKey, TokenInterface $token = null): bool
     {
         if (null === $token) {
diff --git a/src/Kunstmaan/AdminBundle/Helper/Menu/MenuBuilder.php b/src/Kunstmaan/AdminBundle/Helper/Menu/MenuBuilder.php
index 845732685b..e7e2990759 100644
--- a/src/Kunstmaan/AdminBundle/Helper/Menu/MenuBuilder.php
+++ b/src/Kunstmaan/AdminBundle/Helper/Menu/MenuBuilder.php
@@ -134,8 +134,6 @@ public function getTopChildren()
     /**
      * Get immediate children of the specified menu item
      *
-     * @param MenuItem $parent
-     *
      * @return MenuItem[]
      */
     public function getChildren(MenuItem $parent = null)
diff --git a/src/Kunstmaan/CookieBundle/AdminList/CookieAdminListConfigurator.php b/src/Kunstmaan/CookieBundle/AdminList/CookieAdminListConfigurator.php
index 3cc67f3946..5ab2f6c31b 100644
--- a/src/Kunstmaan/CookieBundle/AdminList/CookieAdminListConfigurator.php
+++ b/src/Kunstmaan/CookieBundle/AdminList/CookieAdminListConfigurator.php
@@ -24,11 +24,6 @@ class CookieAdminListConfigurator extends AbstractDoctrineORMAdminListConfigurat
      */
     private $domainConfiguration;
 
-    /**
-     * @param EntityManager                $em                  The entity manager
-     * @param AclHelper                    $aclHelper           The acl helper
-     * @param DomainConfigurationInterface $domainConfiguration
-     */
     public function __construct(EntityManager $em, AclHelper $aclHelper = null, DomainConfigurationInterface $domainConfiguration = null)
     {
         parent::__construct($em, $aclHelper);
diff --git a/src/Kunstmaan/CookieBundle/Entity/Cookie.php b/src/Kunstmaan/CookieBundle/Entity/Cookie.php
index 3e2cd28285..7cb2506eb9 100644
--- a/src/Kunstmaan/CookieBundle/Entity/Cookie.php
+++ b/src/Kunstmaan/CookieBundle/Entity/Cookie.php
@@ -56,8 +56,6 @@ class Cookie extends AbstractEntity
     private $domain;
 
     /**
-     * Set name
-     *
      * @param string $name
      *
      * @return Cookie
@@ -70,8 +68,6 @@ public function setName($name)
     }
 
     /**
-     * Get name
-     *
      * @return string
      */
     public function getName()
@@ -80,8 +76,6 @@ public function getName()
     }
 
     /**
-     * Set description
-     *
      * @param string $description
      *
      * @return Cookie
@@ -94,8 +88,6 @@ public function setDescription($description)
     }
 
     /**
-     * Get description
-     *
      * @return string
      */
     public function getDescription()
@@ -104,10 +96,6 @@ public function getDescription()
     }
 
     /**
-     * Set type
-     *
-     * @param CookieType $type
-     *
      * @return Cookie
      */
     public function setType(CookieType $type = null)
@@ -118,8 +106,6 @@ public function setType(CookieType $type = null)
     }
 
     /**
-     * Get type
-     *
      * @return CookieType
      */
     public function getType()
diff --git a/src/Kunstmaan/CookieBundle/Helper/Menu/CookieMenuAdaptor.php b/src/Kunstmaan/CookieBundle/Helper/Menu/CookieMenuAdaptor.php
index f665055e1d..2c4d8265d8 100644
--- a/src/Kunstmaan/CookieBundle/Helper/Menu/CookieMenuAdaptor.php
+++ b/src/Kunstmaan/CookieBundle/Helper/Menu/CookieMenuAdaptor.php
@@ -59,10 +59,9 @@ public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $par
     }
 
     /**
-     * @param Request $request
-     * @param string  $route
-     * @param string  $uniqueId
-     * @param string  $label
+     * @param string $route
+     * @param string $uniqueId
+     * @param string $label
      */
     private function addMenuItem(MenuBuilder $menu, array &$children, MenuItem $parent, Request $request = null, $route, $uniqueId, $label)
     {
diff --git a/src/Kunstmaan/MediaBundle/Controller/ChooserController.php b/src/Kunstmaan/MediaBundle/Controller/ChooserController.php
index 31f04443fc..05a836c733 100644
--- a/src/Kunstmaan/MediaBundle/Controller/ChooserController.php
+++ b/src/Kunstmaan/MediaBundle/Controller/ChooserController.php
@@ -145,7 +145,7 @@ public function chooserShowFolderAction(Request $request, $folderId): Response
         ];
 
         $forms = [];
-        foreach ($this->mediaManager->getFolderAddActions()  as $addAction) {
+        foreach ($this->mediaManager->getFolderAddActions() as $addAction) {
             $forms[$addAction['type']] = $this->createTypeFormView($this->mediaManager, $addAction['type']);
         }
 
diff --git a/src/Kunstmaan/MediaBundle/Entity/Folder.php b/src/Kunstmaan/MediaBundle/Entity/Folder.php
index 5026a9f616..aa52ea34aa 100644
--- a/src/Kunstmaan/MediaBundle/Entity/Folder.php
+++ b/src/Kunstmaan/MediaBundle/Entity/Folder.php
@@ -224,8 +224,6 @@ public function setRel($rel)
     }
 
     /**
-     * Get createdAd
-     *
      * @return \DateTime
      */
     public function getCreatedAt()
@@ -234,8 +232,6 @@ public function getCreatedAt()
     }
 
     /**
-     * Set createdAd
-     *
      * @param \DateTime $createdAt
      *
      * @return Folder
@@ -248,8 +244,6 @@ public function setCreatedAt($createdAt)
     }
 
     /**
-     * Get updatedAt
-     *
      * @return \DateTime
      */
     public function getUpdatedAt()
@@ -258,8 +252,6 @@ public function getUpdatedAt()
     }
 
     /**
-     * Set updatedAt
-     *
      * @param \DateTime $updatedAt
      *
      * @return Folder
@@ -272,7 +264,7 @@ public function setUpdatedAt($updatedAt)
     }
 
     /**
-     * @return Folder[]:
+     * @return Folder[]
      */
     public function getParents()
     {
@@ -287,8 +279,6 @@ public function getParents()
     }
 
     /**
-     * Get parent
-     *
      * @return Folder
      */
     public function getParent()
@@ -297,10 +287,6 @@ public function getParent()
     }
 
     /**
-     * Set parent
-     *
-     * @param Folder $parent
-     *
      * @return Folder
      */
     public function setParent(Folder $parent = null)
@@ -311,8 +297,6 @@ public function setParent(Folder $parent = null)
     }
 
     /**
-     * Add a child
-     *
      * @return Folder
      */
     public function addChild(Folder $child)
@@ -324,8 +308,6 @@ public function addChild(Folder $child)
     }
 
     /**
-     * Add file
-     *
      * @return Folder
      */
     public function addMedia(Media $media)
@@ -336,8 +318,6 @@ public function addMedia(Media $media)
     }
 
     /**
-     * Get media
-     *
      * @param bool $includeDeleted
      *
      * @return ArrayCollection
@@ -376,8 +356,6 @@ public function hasActive($id)
     }
 
     /**
-     * Get child folders
-     *
      * @param bool $includeDeleted
      *
      * @return ArrayCollection
diff --git a/src/Kunstmaan/NodeBundle/Entity/NodeVersionLock.php b/src/Kunstmaan/NodeBundle/Entity/NodeVersionLock.php
index 9f90392c91..179dc389d1 100644
--- a/src/Kunstmaan/NodeBundle/Entity/NodeVersionLock.php
+++ b/src/Kunstmaan/NodeBundle/Entity/NodeVersionLock.php
@@ -115,8 +115,6 @@ public function getOwner()
     /**
      * Set nodeTranslation
      *
-     * @param \Kunstmaan\NodeBundle\Entity\NodeTranslation $nodeTranslation
-     *
      * @return NodeVersionLock
      */
     public function setNodeTranslation(NodeTranslation $nodeTranslation = null)
diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php
index ac349119fd..8fc4c552e1 100644
--- a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php
+++ b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php
@@ -80,7 +80,7 @@ public function __construct(
      *
      * @param BaseUser|null $user
      *
-     *  @throws AccessDeniedException
+     * @throws AccessDeniedException
      */
     public function publish(NodeTranslation $nodeTranslation, $user = null)
     {
diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeVersionLockHelper.php b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeVersionLockHelper.php
index 00528ee8a3..f8fc16ac26 100644
--- a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeVersionLockHelper.php
+++ b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeVersionLockHelper.php
@@ -53,8 +53,7 @@ public function isNodeVersionLocked(BaseUser $user, NodeTranslation $nodeTransla
     }
 
     /**
-     * @param BaseUser $userToExclude
-     * @param bool     $isPublicNodeVersion
+     * @param bool $isPublicNodeVersion
      *
      * @return array
      */
@@ -107,8 +106,7 @@ protected function createNodeVersionLock(BaseUser $user, NodeTranslation $nodeTr
     /**
      * When editing a node, check if there is a lock for this node translation.
      *
-     * @param bool     $isPublicVersion
-     * @param BaseUser $userToExclude
+     * @param bool $isPublicVersion
      *
      * @return NodeVersionLock[]
      */
diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php b/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php
index 1912f0047a..14892e4681 100644
--- a/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php
+++ b/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php
@@ -129,8 +129,7 @@ public function prepareNodeVersion(NodeVersion $nodeVersion, NodeTranslation $no
     }
 
     /**
-     * @param bool    $isStructureNode
-     * @param TabPane $tabPane
+     * @param bool $isStructureNode
      *
      * @return NodeTranslation
      */
diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php b/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php
index 1ab5d9d86a..7b4335769b 100644
--- a/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php
+++ b/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php
@@ -121,9 +121,6 @@ public function setLocale($locale)
         $this->locale = $locale;
     }
 
-    /**
-     * @param Node $currentNode
-     */
     public function setCurrentNode(Node $currentNode = null)
     {
         $this->currentNode = $currentNode;
diff --git a/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php b/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php
index 21e967f449..2209d44ce1 100644
--- a/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php
+++ b/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php
@@ -341,7 +341,6 @@ public function getAllMenuNodes(
     /**
      * Get all parents of a given node. We can go multiple levels up.
      *
-     * @param Node   $node
      * @param string $lang
      *
      * @return Node[]
@@ -386,7 +385,6 @@ public function getAllParents(Node $node = null, $lang = null)
     /**
      * Get the root node of a given node.
      *
-     * @param Node   $node
      * @param string $lang
      *
      * @return Node
diff --git a/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php b/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php
index a8748d8094..ea51c25a83 100644
--- a/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php
+++ b/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php
@@ -42,9 +42,8 @@ public function getNodeTranslationByNodeId(int $nodeId, string $lang)
     /**
      * Get max children weight
      *
-     * @param Node   $parentNode
-     * @param string $lang       (optional) Only return max weight for the
-     *                           given language
+     * @param string $lang (optional) Only return max weight for the
+     *                     given language
      *
      * @return int
      */
@@ -64,9 +63,8 @@ public function getMaxChildrenWeight(Node $parentNode = null, $lang = null)
     /**
      * Get min children weight
      *
-     * @param Node   $parentNode
-     * @param string $lang       (optional) Only return min weight for the
-     *                           given language
+     * @param string $lang (optional) Only return min weight for the
+     *                     given language
      *
      * @return int
      */
diff --git a/src/Kunstmaan/NodeBundle/Repository/NodeVersionLockRepository.php b/src/Kunstmaan/NodeBundle/Repository/NodeVersionLockRepository.php
index a18bb38cb6..408027804c 100644
--- a/src/Kunstmaan/NodeBundle/Repository/NodeVersionLockRepository.php
+++ b/src/Kunstmaan/NodeBundle/Repository/NodeVersionLockRepository.php
@@ -11,9 +11,8 @@ class NodeVersionLockRepository extends \Doctrine\ORM\EntityRepository
     /**
      * Check if there is a nodetranslation lock that's not passed the 30 minute threshold.
      *
-     * @param bool     $isPublicVersion
-     * @param int      $threshold
-     * @param BaseUser $userToExclude
+     * @param bool $isPublicVersion
+     * @param int  $threshold
      *
      * @return NodeVersionLock[]
      */
diff --git a/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php b/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php
index 3a08fb0b5b..6ba49edf2d 100644
--- a/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php
+++ b/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php
@@ -207,7 +207,6 @@ public function getUrlByInternalName($internalName, $locale, $parameters = [], $
 
     /**
      * @param string $locale
-     * @param Node   $node
      * @param bool   $includeHiddenFromNav
      *
      * @return NodeMenu
diff --git a/src/Kunstmaan/NodeSearchBundle/PagerFanta/Adapter/SearcherRequestAdapter.php b/src/Kunstmaan/NodeSearchBundle/PagerFanta/Adapter/SearcherRequestAdapter.php
index 5f995ebd31..52c5b55574 100644
--- a/src/Kunstmaan/NodeSearchBundle/PagerFanta/Adapter/SearcherRequestAdapter.php
+++ b/src/Kunstmaan/NodeSearchBundle/PagerFanta/Adapter/SearcherRequestAdapter.php
@@ -79,8 +79,6 @@ public function getSlice($offset, $length)
     }
 
     /**
-     * @param ResultSet $result
-     *
      * @return array|ResultSet
      */
     protected function processResponse(ResultSet $result = null)
diff --git a/src/Kunstmaan/PagePartBundle/Helper/Services/PagePartCreatorService.php b/src/Kunstmaan/PagePartBundle/Helper/Services/PagePartCreatorService.php
index decc9c25d8..e5bb6945e4 100644
--- a/src/Kunstmaan/PagePartBundle/Helper/Services/PagePartCreatorService.php
+++ b/src/Kunstmaan/PagePartBundle/Helper/Services/PagePartCreatorService.php
@@ -69,21 +69,16 @@ public function getEntityManager()
     /**
      * Add a single pagepart to an existing page for a specific language, in an optional position.
      *
-     * @param mixed(Node|string)  $nodeOrInternalName
-     *                                                A Node instance or the internal name.
-     *                                                When the internal name is passed we'll get the node instance.
-     *                                                Based on the language we'll locate the correct Page instance.
-     * @param pagePartInterface $pagePart
-     *                                    A completely configured pagepart for this language
-     * @param string            $language
-     *                                    The languagecode. nl|fr|en|.. . Just one.
-     * @param string            $context
-     *                                    Where you want the pagepart to be
-     * @param mixed(integer\NULL) $position
-     *                                                Leave null if you want to append at the end.
-     *                                                Otherwise set a position you would like and it'll inject the pagepart in that position.
-     *                                                It won't override pageparts but it will rather inject itself in that position and
-     *                                                push the other pageparts down.
+     * @param Node|string       $nodeOrInternalName A Node instance or the internal name.
+     *                                              When the internal name is passed we'll get the node instance.
+     *                                              Based on the language we'll locate the correct Page instance.
+     * @param pagePartInterface $pagePart           A completely configured pagepart for this language
+     * @param string            $language           The languagecode. nl|fr|en|.. . Just one.
+     * @param string            $context            Where you want the pagepart to be
+     * @param int|null          $position           Leave null if you want to append at the end.
+     *                                              Otherwise set a position you would like and it'll inject the pagepart in that position.
+     *                                              It won't override pageparts but it will rather inject itself in that position and
+     *                                              push the other pageparts down.
      */
     public function addPagePartToPage($nodeOrInternalName, PagePartInterface $pagePart, $language, $context = 'main', $position = null)
     {
@@ -109,10 +104,8 @@ public function addPagePartToPage($nodeOrInternalName, PagePartInterface $pagePa
     /**
      * A helper function to more easily append multiple pageparts in different manners.
      *
-     * @param mixed(Node|string) $nodeOrInternalName
-     *                                               The node that you'd like to append the pageparts to. It's also possible to provide an internalname.
-     * @param array $structure
-     *                         The structure array is something like this:
+     * @param Node|string $nodeOrInternalName The node that you'd like to append the pageparts to. It's also possible to provide an internalname.
+     * @param array       $structure          The structure array is something like this:
      *
      *      array('main' => array(
      *          function() { return new DummyPagePart('A') }, function() { return new DummyPagePart('B') }
@@ -126,8 +119,7 @@ public function addPagePartToPage($nodeOrInternalName, PagePartInterface $pagePa
      *      You can also include variables in the pagepart arrays if you want.
      *
      *      Or optionally you can use the results of the getCreatorArgumentsForPagePartAndProperties function instead of an anonymous function.
-     * @param string $language
-     *                         The language of the translation you want to append to
+     * @param string $language The language of the translation you want to append to
      *
      * @throws \LogicException
      */
@@ -165,9 +157,9 @@ public function addPagePartsToPage($nodeOrInternalName, array $structure, $langu
     }
 
     /**
-     * @param mixed(Node|string) $nodeOrInternalName
-     * @param string $language
-     * @param string $templateName
+     * @param Node|string $nodeOrInternalName
+     * @param string      $language
+     * @param string      $templateName
      */
     public function setPageTemplate($nodeOrInternalName, $language, $templateName)
     {
diff --git a/src/Kunstmaan/SeoBundle/Entity/Seo.php b/src/Kunstmaan/SeoBundle/Entity/Seo.php
index dc1f21267b..91f73ec93f 100644
--- a/src/Kunstmaan/SeoBundle/Entity/Seo.php
+++ b/src/Kunstmaan/SeoBundle/Entity/Seo.php
@@ -317,8 +317,6 @@ public function getOgDescription()
     }
 
     /**
-     * @param Media $ogImage
-     *
      * @return Seo
      */
     public function setOgImage(Media $ogImage = null)
diff --git a/src/Kunstmaan/SeoBundle/Form/SeoType.php b/src/Kunstmaan/SeoBundle/Form/SeoType.php
index bb8fa704c0..f791d2edee 100644
--- a/src/Kunstmaan/SeoBundle/Form/SeoType.php
+++ b/src/Kunstmaan/SeoBundle/Form/SeoType.php
@@ -78,12 +78,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 function ($original) {
                     // string to array
                     $array = explode(',', $original ?? '');
+
                     // trim all the values
                     return array_map('trim', $array);
                 },
                 function ($submitted) {
                     // trim all the values
                     $value = array_map('trim', $submitted);
+
                     // join together
                     return implode(',', $value);
                 }
diff --git a/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php b/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php
index 2d63f59739..2899de6ec1 100644
--- a/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php
+++ b/src/Kunstmaan/SeoBundle/Twig/SeoTwigExtension.php
@@ -124,8 +124,7 @@ public function getTitleFor(AbstractPage $entity)
     }
 
     /**
-     * @param AbstractPage $entity
-     * @param string|null  $default if given we'll return this text if no SEO title was found
+     * @param string|null $default if given we'll return this text if no SEO title was found
      *
      * @return string
      */
@@ -182,8 +181,6 @@ protected function getPreferredValue(array $values)
     }
 
     /**
-     * @param AbstractPage $entity
-     *
      * @return string|null
      */
     private function getSeoTitle(AbstractPage $entity = null)