If you do only one thing to improve the user experience, try this:
Don’t underline words that are not links