More style fixes