Move locators to class vars