Coming along...
More style fixes