More style changes

Here are some more style changes, header mostly