CFG: More style changes