some cosmetic changes for language component