storage refactoring