cleaned up selectors