Refactor storage component