More style tidying.