Fixing snowleo's comments on my last PR

Update metrics and fix the comments snowleo asked me to