More style tweaks
Fixed merge conflict