Rewrite drilldown_map to be more readable