Formatting, other small changes.