refactoring
add Locator and correct class visibility