Avoid duplicate event formatting
Move duplicate event formatting code into an include