Minor code reformat
Small code modification
Annotate trie classes as @Beta