More style corrections