Add _ as word delimiter
Remove comments