Remove stale commented code
Introduce color support per graph data series
Refactor Measurement class

* Done to reflect what the fields actually represent