init-storage refactoring