Cleaned up how stats are stored.