Simplified some selectors