refactoring - made json type infos consistent for all query types
cleanup - removed unused imports
Merge pull request #118 from darxriggs/master

cleanup & refactoring