Updated _extract_events... and removed whitespace.