Cleaned up plotter