Refactored Alert->Event. #1