minor refactor in Metrik