More style refactoring