More style refactoring.