Polish the data store