Clean: Separate hierarchical code from fast_dict