Minor source cleanup.
Added PersistantDataStore.