Starting cleaning elaboration of terms
Cleaning rewriting
Added elaboration in a separate file