Events: Update for formatting, markup, and other small tweaks