refactoring: extract storage