Refine word-break and add comments