[cleanup] Use StringUtils for string manipulation