Refactor

Signed-off-by: ribesg <ribesg@ensimag.imag.fr>