Text refactor