Refactor
Adjust metric thresholds