Minor modifications for the convenience reason.