clean up text() usage

clean up text() usage