Refactor code && Check to Repair Handlers