Cleanup and consolidation; make matrix of single-year scatterplots into a function