refactor - use selectors instead of elements