Universal scatterplot class and more clean up.