First Style Pass

These are the style changes I showed you Thursday.