Refactor to use string helpers.