More style tweaks and cleanup