More style fixup