clean up , improved text rendering