Refactor "text" and don't store it