Clean up the way metrics are stored & output