Move some statistic calculations to 'yearPassed'
Refactor Statistic module