Sri | Refactored dinodex on further feedback