Major clean-up of MultiSamplePlot