1 - Good catch.
2 - Yeah, I could do that. I was just reusing avgCdsSize to make this a one-liner. Doesn't really matter tho.