Reorganized model evaluation metrics