stats struct refactoring