cleaned up table selectors