Rename the event + minor formatting changes