A little refactoring in the data store