More style cleanup.