Cleaned up query some more