improve readability of queries