Some cleanup.  Fixed another warning ...
Another minor cleanup