Add new Stats, clean up code