wrap comments, remove Match references