apply nitpicks comments and avoid delete.