Replace ad-hoc delimiter replacement with StringUtils method.