clean up of CNV grammar