Added to make_plot script, cleaning