[11] Cleaned up Events code