Code format + cleanup.