More style, cleanup