Merge "EventLogHelper: Clean up code"