Using StringUtils instead of homegrown