Refactored the event queries for readability