Tidy up PlotCanvas and PlotSurface