add rescuable
simplfy code
code reformatting