[wallace] refactoring element locators