String refactor