Cleanup metrics code a touch