Code cleanup
Fixed logical bug to detect language codes with more than 2 characters