Style updates

Here are the style changes I suggest :-)