Made the selectors more compact