Update Doc. Code cleanup.