Move plotting to plot_utils