Bunch of style updates