PLOT: minor code cleaning