refactor storage