[upstream] Minor text change and a cleanup