Improve Makefile
Refactor compute_cnf + add more comments