Refactor Visualization::Locator