Plotter cleaned up