Cleaned up passing weighting.scheme argument