changes related to code review about the RepairAPI