reformat
Erat improved
Curry done