Fix conjuctive visitor
Code clean up