Remove the trailing spaces in the lines
clarify/optimize the recovery mechanism