Reduced complexity of language menu
Code cleanup