Cleaned up Selector/Selectors.