Refactor for statistics design

@SansPseudoFix, mon loulou, nous touchons au but !