Replace the string utilities with StringUtils from Apache Lang 3