Refactored a bit.  Make datastore.Datatype elements private