Misc restyling.

Nothing much, just some restyling.