update doc and cleanup