Can transition between events, cleaned up some of the code