enhance the string match, add comment match and so on