Document and clean up