continue reworking

Signed-off-by: Corentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>