Lots of style fixes