cleanup and Add R plotter