Minor Refactor to GoToEvent