locatorService code refactoring.