Fixed some datastore regressions
Formating fixup
Use correct file for leaf nodes