More style fix
Merge