refactoring to make storage scheme simpler (removed one of the trees)