More refactoring; Abstracted TrecSearchThriftClient.