More style improvments
More style changes