More style guide enforcement