Cleanup and document updating