Scatter plot refactorings and improvements using suggestions from jrideout