Cleaned up QueryBuilder (a little)