refactor storage util