cleaning up the storage API to be consistent