code review...

Again, should be embedded inside Metric.