Cleanup; update documentation.