Improve law name stripper