refactored the metrics generation to more easily distinguish between models.