clean up events, refine chart