Stats class small refactoring