More style clean up.