Make funnel fullly parameterized.  Make variable names more clear.