[FOLD] SHAMap: review comments
[FOLD] NodeStore: review comments