diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index 412bb873e..3841811eb 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -35,7 +35,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime")
      */
-    private $createdAt;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
@@ -46,7 +46,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTimeInterface $date = null;
 
     /**
      * @ORM\Column(type="time", nullable=true)
@@ -69,18 +69,18 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private $note;
+    private ?string $note = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
      * @ORM\JoinColumn(nullable=false)
      */
-    private $type;
+    private ?\Chill\AsideActivityBundle\Entity\AsideActivityCategory $type = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $updatedAt;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
index c6a35e3d7..779aae47a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
@@ -20,7 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByLocationAggregator implements AggregatorInterface
 {
-    public function __construct(private LocationRepository $locationRepository)
+    public function __construct(private readonly LocationRepository $locationRepository)
     {
     }
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
index 93b0c495d..40629a1d9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
@@ -33,43 +33,19 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-final class ListAsideActivity implements ListInterface, GroupedExportInterface
+final readonly class ListAsideActivity implements ListInterface, GroupedExportInterface
 {
-    private AsideActivityCategoryRepository $asideActivityCategoryRepository;
-
-    private CategoryRender $categoryRender;
-
-    private CenterRepositoryInterface $centerRepository;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private EntityManagerInterface $em;
-
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private UserHelper $userHelper;
-
     public function __construct(
-        EntityManagerInterface $em,
-        DateTimeHelper $dateTimeHelper,
-        UserHelper $userHelper,
-        ScopeRepositoryInterface $scopeRepository,
-        CenterRepositoryInterface $centerRepository,
-        AsideActivityCategoryRepository $asideActivityCategoryRepository,
-        CategoryRender $categoryRender,
+        private EntityManagerInterface $em,
+        private DateTimeHelper $dateTimeHelper,
+        private UserHelper $userHelper,
+        private ScopeRepositoryInterface $scopeRepository,
+        private CenterRepositoryInterface $centerRepository,
+        private AsideActivityCategoryRepository $asideActivityCategoryRepository,
+        private CategoryRender $categoryRender,
         private LocationRepository $locationRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
+        private TranslatableStringHelperInterface $translatableStringHelper
     ) {
-        $this->em = $em;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->userHelper = $userHelper;
-        $this->scopeRepository = $scopeRepository;
-        $this->centerRepository = $centerRepository;
-        $this->asideActivityCategoryRepository = $asideActivityCategoryRepository;
-        $this->categoryRender = $categoryRender;
-        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -98,99 +74,78 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'id':
-            case 'note':
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.' . $key;
-                    }
+        return match ($key) {
+            'id', 'note' => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.' . $key;
+                }
 
-                    return $value ?? '';
-                };
+                return $value ?? '';
+            },
+            'duration' => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.' . $key;
+                }
 
-            case 'duration':
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.' . $key;
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    if (null === $value) {
-                        return '';
-                    }
+                if ($value instanceof DateTimeInterface) {
+                    return $value->format('H:i:s');
+                }
 
-                    if ($value instanceof DateTimeInterface) {
-                        return $value->format('H:i:s');
-                    }
+                return $value;
+            },
+            'createdAt', 'updatedAt', 'date' => $this->dateTimeHelper->getLabel('export.aside_activity.' . $key),
+            'agent_id', 'creator_id' => $this->userHelper->getLabel($key, $values, 'export.aside_activity.' . $key),
+            'aside_activity_type' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.aside_activity_type';
+                }
 
-                    return $value;
-                };
+                if (null === $value || '' === $value || null === $c = $this->asideActivityCategoryRepository->find($value)) {
+                    return '';
+                }
 
-            case 'createdAt':
-            case 'updatedAt':
-            case 'date':
-                return $this->dateTimeHelper->getLabel('export.aside_activity.' . $key);
+                return $this->categoryRender->renderString($c, []);
+            },
+            'location' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.location';
+                }
 
-            case 'agent_id':
-            case 'creator_id':
-                return $this->userHelper->getLabel($key, $values, 'export.aside_activity.' . $key);
+                if (null === $value || '' === $value || null === $l = $this->locationRepository->find($value)) {
+                    return '';
+                }
 
-            case 'aside_activity_type':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.aside_activity_type';
-                    }
+                return $l->getName();
+            },
+            'main_scope' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.main_scope';
+                }
 
-                    if (null === $value || '' === $value || null === $c = $this->asideActivityCategoryRepository->find($value)) {
-                        return '';
-                    }
+                if (null === $value || '' === $value || null === $c = $this->scopeRepository->find($value)) {
+                    return '';
+                }
 
-                    return $this->categoryRender->renderString($c, []);
-                };
+                return $this->translatableStringHelper->localize($c->getName());
+            },
+            'main_center' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.main_center';
+                }
 
-            case 'location':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.location';
-                    }
+                if (null === $value || '' === $value || null === $c = $this->centerRepository->find($value)) {
+                    /** @var Center $c */
+                    return '';
+                }
 
-                    if (null === $value || '' === $value || null === $l = $this->locationRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $l->getName();
-                };
-
-            case 'main_scope':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.main_scope';
-                    }
-
-                    if (null === $value || '' === $value || null === $c = $this->scopeRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->translatableStringHelper->localize($c->getName());
-                };
-
-            case 'main_center':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.main_center';
-                    }
-
-                    if (null === $value || '' === $value || null === $c = $this->centerRepository->find($value)) {
-                        /** @var Center $c */
-                        return '';
-                    }
-
-                    return $c->getName();
-                };
-
-            default:
-                throw new LogicException('this key is not supported : ' . $key);
-        }
+                return $c->getName();
+            },
+            default => throw new LogicException('this key is not supported : ' . $key),
+        };
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index 7f4053917..1610d939d 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -42,8 +42,11 @@ class MembersEditor
 
     private array $persistables = [];
 
-    public function __construct(private readonly ValidatorInterface $validator, private readonly ?\Chill\PersonBundle\Entity\Household\Household $household, private readonly EventDispatcherInterface $eventDispatcher)
-    {
+    public function __construct(
+        private readonly ValidatorInterface $validator,
+        private readonly ?\Chill\PersonBundle\Entity\Household\Household $household,
+        private readonly EventDispatcherInterface $eventDispatcher
+    ) {
     }
 
     /**
@@ -160,8 +163,6 @@ class MembersEditor
      *
      * Makes a person leave the household **associated with this editor**.
      *
-     * @param DateTimeImmutable $date
-     * @param Person $person
      * @return $this
      */
     public function leaveMovement(