Refactoring stats code ...