Refactors to use better names, and simplify implementation via StringUtil methods
refactors is a good word