Cleaned up Selector.