Refactor Ears self healing

Aims to fix #291