current_events: code cleanup