Make the style test happy
More style cleanup
More style cleanup
more style cleanup