More style tweaks around namespacing