Minor optimizations

Minor update and optimization under Events.