Code cleaning

Code cleaning
Merge pull request #2 from AugierLe42e/statistics_design

Code cleaning