Cleanup and change text method names.