Cleanup the doc
Fix the locator