Refactored Alert->Event. #14