Added better querying to Jack

Lets clean up the indentation here