Formatting and removed stats counting