Health stats refactored