Document, clean up, and test