Cleanup and document update