Document and tidy up events