More style cleanup