[66919768] Cleaned up event handling a bit