Code cleanup; shortcut `d3`