Cleaned up query 1 a bit