More refactor/cleanup, now coloring data points smoothely