Formatting cleanup.
More things to do.