More style adjustments, restructured a bit