More doc and cleanup.