Fix a bunch of style errors