Weighting: cleanup variable names further.