cleanup and update doc