More style improvements.