Mapping , to \ and removed some comments