More style and syntax fixes