Correct broken redo
Tidy up