I've been cleaning up dataStorage classes