Cleanup the TreebankRetriever
Revert termination check in TreebankRetriever
Minor reformatting