refactoring storage.