Some DRYing and started work on adding matched names to Event Details