Improve text helper