Added the EventTracker on here to do proper event cleanup. This required some indentation love.