Query return types
Remove unneeded comments
QueryBuilder added return types