minor refactoring of storages