Clean up and optimise PlotField