Formatting + cleanup.
More cleanup.