Improve description regexes