Refactor health components