Refactor subscriber notifications