Completed Dettaglio refactoring