Refactoring

Signed-off-by: Levi LIRVAT <levi.lirvat@niji.fr>