Remove some redundant code bits, add correct event list headers