Add comment and close DB earlier.