Code clean up - now works with kind2 cex