More style improvements for Sonar