Simple refactoring to simplify code and allow easier HR25-specific temperature display.