locators minor refactoring