refactoring storage