refactoring DBQuery ver 0.1