Refractoring la revanche !