By locator refactoring