Formatting + cleanup