Formatting + cleanup.