Changed Code Formatting of Events