Style updates 2

Lots of changes I made, and some from Ryan