R: renamed saver->storage
R: refactored DictStorage