Stats refactor