More JS cleanup, event list work