Refactored language codes