+ system-metrics: refactor