Style cleaning-up

Change all that were discussed this morning