Code review changes

What I found that was easier to code than explain.  :)