Code review changes

Now with more stuff we discussed.  Can squash if individual changes OK.