Tidied up MetricsRoute