locator class refactor