Stats.java reform