Refacroring in events.