Tidied up the alerts