move event vars to event