Continued style changes

I'm not sure why these changes didn't go in with last commit.  Something
seems to be going on with my Github