I agree. I'll do that in the next PR