Whole bunch of style revisions