Format + cleanup