Minor cleanup on DataStore.