Remove trailing spaces
More style fixes