Minor refactor and support event pretty printing