More style and fixes