More style changes, fixing things