More style fixes...sigh