Refactoring BasketStorage