applying some refactoring in the metrics output. related to #10