Refactors to streamline alerts