More style corrections...