More style guide updates