More style cleanups