I agree.  I'll get a constant added & make that change with my next commit which will also address the other items.