Clean up the whole idea of listening for an event

@cogito