refactoring the storage