Plotting refactor.