clean up and update doc