chage event name and clean code