Add comment + cleanup.