More style improvements for SM