Cleanup event formatters

Cleanup event formatters