Minor simplification and grammar correction
Correct db client for table scan change