Clean up events
Fix typo