- Small Cleanups
- Simplified & optimized EventWaiter