removed unnecessary code
fixed * event