Fix a few style thingies