More style guide changes