cleaned up tble selectors