A bunch of style updates