More style fixes, breaking up.