More style improvements