Nicer layout.
A bit of tidying.