PLOT: plot class cleanup