Small changes to make query more understandable