Rewrite CorePrep and improve eta expansion