Refactor code to support arrival and departure events from corresponding readers