Clean up and document