rm event fire and use model event
fix indent
comment code