Final style changes?

We'll see!