Refactor Element Selectors