some code cleaning for lifting counterexamples
Merge remote-tracking branch 'origin/master'