Completed carrello refactoring