improve Locator class: location storage is class attr now