Tidy up, and improve the health bar behavior