Last iteration of minor changes to trie. Modifications will follow