Validation stuff
More style fixes