More style fixes...