Small refactoring of L1HealthPot and other small changes