Refactors storage