Refactor
Signed-off-by: nicolasculerier <isn@ISNKEY.(none)>