Improve underlining