Srorage refactorings